From aadcf40b9b7f716fb53dc4fa41d7d484eeb2c7a5 Mon Sep 17 00:00:00 2001 From: glx Date: Sun, 17 Feb 2019 01:16:24 +0100 Subject: [PATCH] Fix 1585eb1a3: wrong default selection for goals and story book --- src/toolbar_gui.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 9b84268efd..ce0ce58f5f 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -218,7 +218,6 @@ static const int CTMN_SPECTATOR = -4; ///< Show a company window as spectator * @param w The toolbar window. * @param widget The button widget id. * @param grey A bitbask of which items to mark as disabled. - * @param include_spectator If true, a spectator option is included in the list. */ static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0) { @@ -254,7 +253,7 @@ static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0) *list->Append() = new DropDownListCompanyItem(c, false, HasBit(grey, c)); } - PopupMainToolbMenu(w, widget, list, _local_company == COMPANY_SPECTATOR ? CTMN_CLIENT_LIST : (int)_local_company); + PopupMainToolbMenu(w, widget, list, _local_company == COMPANY_SPECTATOR ? (widget == WID_TN_COMPANIES ? CTMN_CLIENT_LIST : CTMN_SPECTATOR) : (int)_local_company); }