From 93a6fd42d1a9eec51943182a8c9ed983e8b2d5b1 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Tue, 26 Feb 2019 22:13:24 +0000
Subject: [PATCH] Fix 23960d0f2c: Company livery window shows incorrect groups
 when opened from group window in multiplayer.

---
 src/company_gui.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 143fa0ab82..a3885ec960 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -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 company, GroupID group)
 	if (w == NULL) {
 		new SelectCompanyLiveryWindow(&_select_company_livery_desc, company, group);
 	} else if (group != INVALID_GROUP) {
-		w->SetSelectedGroup(group);
+		w->SetSelectedGroup(company, group);
 	}
 }