mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix #7707: Opening scenario editor closes game

Browse Source 
Ensure w is updated after closing the dropdown window.
This commit is contained in:
Ted John
2018-06-27 10:11:50 +01:00
committed by Michael Steenbeek
parent 84e973fa55
commit fe76c807aa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/input/MouseInput.cpp
View File

@@ -1257,6 +1257,8 @@ void input_state_widget_pressed(int32_t x, int32_t y, int32_t state, rct_widgeti
{
if (w)
{
auto wClass = w->classification;
auto wNumber = w->number;
int32_t dropdown_index = 0;
if (w->classification == WC_DROPDOWN)
@@ -1315,9 +1317,11 @@ void input_state_widget_pressed(int32_t x, int32_t y, int32_t state, rct_widgeti
}
}
window_event_dropdown_call(cursor_w, cursor_widgetIndex, dropdown_index);
}
dropdown_cleanup:
window_close_by_class(WC_DROPDOWN);
window_close_by_class(WC_DROPDOWN);
// Update w as it will be invalid after closing the dropdown window
w = window_find_by_number(wClass, wNumber);
}
}
_inputState = INPUT_STATE_NORMAL;