From 1e2cf9f77b63f35b15c11b8030c685ba0a28f833 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 9 May 2020 16:06:06 +0100 Subject: [PATCH] Fix first widget being pressed on tabless plugin windows --- src/openrct2-ui/scripting/CustomWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index e3689d0349..9681fdbadc 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -580,11 +580,14 @@ namespace OpenRCT2::Ui::Windows { const auto& info = GetInfo(w); auto numTabs = info.Desc.Tabs.size(); - for (size_t i = 0; i < numTabs; i++) + if (numTabs != 0) { - w->pressed_widgets &= ~(1 << (WIDX_TAB_0 + i)); + for (size_t i = 0; i < numTabs; i++) + { + w->pressed_widgets &= ~(1 << (WIDX_TAB_0 + i)); + } + w->pressed_widgets |= 1LL << (WIDX_TAB_0 + w->page); } - w->pressed_widgets |= 1LL << (WIDX_TAB_0 + w->page); } static void window_custom_invalidate(rct_window* w)