From 3c29b15de98b5cf81cea8f2084cfda57ddc719b6 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 10 Feb 2018 21:37:25 +0000 Subject: [PATCH] Fix segfault if no RCT2 install path --- src/openrct2/interface/Window.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 09a4b14764..9fc4822ed2 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -818,6 +818,11 @@ void window_close_top() */ void window_close_all() { + if (gWindowNextSlot == nullptr) + { + return; + } + window_close_by_class(WC_DROPDOWN); for (rct_window * w = RCT2_LAST_WINDOW; w >= g_window_list; w--) @@ -2667,11 +2672,7 @@ void window_reset_visibilities() void window_init_all() { - if (gWindowNextSlot != nullptr) - { - window_close_all(); - } - + window_close_all(); gWindowNextSlot = g_window_list; }