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

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

pull/7314/head
peter1138 2019-02-26 22:13:24 +00:00 committed by Patric Stout
parent c61acc7fc1
commit 93a6fd42d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/company_gui.cpp
View File

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