From 2523b1f328a0b56fa9d836362c41dc28bf0663b9 Mon Sep 17 00:00:00 2001 From: ZedThree Date: Fri, 9 May 2014 22:44:55 +0200 Subject: [PATCH] Fix a couple of window bugs --- src/window_game_top_toolbar.c | 7 ++++--- src/window_guest_list.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c index fa59d02950..afacce3cf1 100644 --- a/src/window_game_top_toolbar.c +++ b/src/window_game_top_toolbar.c @@ -208,9 +208,10 @@ static void window_game_top_toolbar_mouseup() } break; case WIDX_SCENERY: - tool_set(w, WIDX_SCENERY, 0); - RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 6); - RCT2_CALLPROC_EBPSAFE(0x006E0FEF); + if (!tool_set(w, WIDX_SCENERY, 0)) { + RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 6); + RCT2_CALLPROC_EBPSAFE(0x006E0FEF); + } break; case WIDX_PATH: if (window_find_by_id(WC_FOOTPATH, 0) == NULL) { diff --git a/src/window_guest_list.c b/src/window_guest_list.c index 4af11e4dd4..a3f2de1480 100644 --- a/src/window_guest_list.c +++ b/src/window_guest_list.c @@ -142,7 +142,7 @@ void window_guest_list_open() rct_window* window; // Check if window is already open - window = window_bring_to_front_by_id(WC_RIDE_LIST, 0); + window = window_bring_to_front_by_id(WC_GUEST_LIST, 0); if (window != NULL) return; @@ -994,4 +994,4 @@ static int get_guest_face_sprite_large(rct_peep* peep){ } return sprite; -} \ No newline at end of file +}