cpp/openttd-patchpack/source Changeset - r23390:9489373edb9a

Changeset - r23390:9489373edb9a

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 6 years ago 2019-02-26 22:13:24
peter1138@openttd.org

Fix 23960d0f2c: Company livery window shows incorrect groups when opened from group window in multiplayer.

1 file changed with 4 insertions and 4 deletions:

src/company_gui.cpp

0 comments (0 inline, 0 general)

src/company_gui.cpp

➞

Show inline comments

@@ @@ -707,7 +707,7 @@ public: @@
 			this->BuildGroupList(company);
 			this->SetRows();
 		} else {
 			this->SetSelectedGroup(group);
+			this->SetSelectedGroup(company, group);
+		}
 		this->FinishInitNested(company);
@@ @@ -715,7 +715,7 @@ public: @@
 		this->InvalidateData(1);
+	}
 	void SetSelectedGroup(GroupID group)
+	void SetSelectedGroup(CompanyID company, GroupID group)
+	{
 		this->RaiseWidget(this->livery_class + WID_SCL_CLASS_GENERAL);
 		const Group *g = Group::Get(group);
@@ @@ -730,7 +730,7 @@ public: @@
 		this->LowerWidget(this->livery_class + WID_SCL_CLASS_GENERAL);
 		this->groups.ForceRebuild();
-		this->BuildGroupList((CompanyID)this->window_number);
+		this->BuildGroupList(company);
 		this->SetRows();
 		/* Position scrollbar to selected group */
@@ @@ -1105,7 +1105,7 @@ void ShowCompanyLiveryWindow(CompanyID c @@
 	if (w == NULL) {
 		new SelectCompanyLiveryWindow(&_select_company_livery_desc, company, group);
 	} else if (group != INVALID_GROUP) {
 		w->SetSelectedGroup(group);
+		w->SetSelectedGroup(company, group);
+	}
+}

0 comments (0 inline, 0 general)