Fix #15004: Crash when dropdown is open when end game screen appears (#15006)

This commit is contained in:
Charles Pigott
2025-12-31 22:24:31 +00:00
committed by dP
parent fcb00ca74b
commit cc84f3604b

View File

@@ -296,7 +296,9 @@ void Window::OnDropdownClose(Point pt, WidgetID widget, int index, int click_res
{ {
if (widget < 0) return; if (widget < 0) return;
if (instant_close) { /* Many dropdown selections depend on the position of the main toolbar,
* so if it doesn't exist (e.g. the end screen has appeared), just skip the instant close behaviour. */
if (instant_close && FindWindowById(WC_MAIN_TOOLBAR, 0) != nullptr) {
/* Send event for selected option if we're still /* Send event for selected option if we're still
* on the parent button of the dropdown (behaviour of the dropdowns in the main toolbar). */ * on the parent button of the dropdown (behaviour of the dropdowns in the main toolbar). */
if (GetWidgetFromPos(this, pt.x, pt.y) == widget) { if (GetWidgetFromPos(this, pt.x, pt.y) == widget) {