mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix 1585eb1a3: wrong default selection for goals and story book

pull/7248/head
glx 2019-02-17 01:16:24 +01:00 committed by glx22
parent 548ec05a48
commit aadcf40b9b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/toolbar_gui.cpp
View File

@ -218,7 +218,6 @@ static const int CTMN_SPECTATOR = -4; ///< Show a company window as spectator
* @param w The toolbar window. * @param w The toolbar window.
* @param widget The button widget id. * @param widget The button widget id.
* @param grey A bitbask of which items to mark as disabled. * @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) 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)); *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);
} }