cpp/openttd-patchpack/source Changeset - r23325:4a341df798c8

Changeset - r23325:4a341df798c8

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 5 years ago 2019-02-17 00:16:24
glx@openttd.org

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

1 file changed with 1 insertions and 2 deletions:

src/toolbar_gui.cpp

0 comments (0 inline, 0 general)

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -215,13 +215,12 @@ static const int CTMN_SPECTATOR = -4; @@
 /**
  * Pop up a generic company list menu.
  * @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)
+{
 	DropDownList *list = new DropDownList();
 	switch (widget) {
@@ @@ -251,13 +250,13 @@ static void PopupMainCompanyToolbMenu(Wi @@
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 		if (!Company::IsValidID(c)) continue;
 		*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);
+}
 static ToolbarMode _toolbar_mode;
 static CallBackFunction SelectSignTool()

0 comments (0 inline, 0 general)