1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-13 14:45:36 +01:00

Codechange: Don't access cargo filter before it is initialized. ()

The cargo filter list is initialized during window OnInit, but the first
build of the filtered list occurred before this.
This commit is contained in:
PeterN 2023-09-20 08:58:08 +01:00 committed by GitHub
parent 48dc4219ea
commit a0c6259e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -358,9 +358,6 @@ public:
this->group_rename = INVALID_GROUP;
this->group_over = INVALID_GROUP;
this->BuildVehicleList();
this->SortVehicleList();
this->groups.ForceRebuild();
this->groups.NeedResort();
this->BuildGroupList(vli.company);
@ -377,6 +374,9 @@ public:
this->FinishInitNested(window_number);
this->owner = vli.company;
this->BuildVehicleList();
this->SortVehicleList();
}
~VehicleGroupWindow()

View File

@ -1624,10 +1624,11 @@ public:
this->industries.SetListing(this->last_sorting);
this->industries.SetSortFuncs(IndustryDirectoryWindow::sorter_funcs);
this->industries.ForceRebuild();
this->BuildSortIndustriesList();
this->FinishInitNested(0);
this->BuildSortIndustriesList();
this->querystrings[WID_ID_FILTER] = &this->industry_editbox;
this->industry_editbox.cancel_button = QueryString::ACTION_CLEAR;
}

View File

@ -1842,9 +1842,6 @@ public:
this->vscroll = this->GetScrollbar(WID_VL_SCROLLBAR);
this->BuildVehicleList();
this->SortVehicleList();
/* Set up the window widgets */
this->GetWidget<NWidgetCore>(WID_VL_LIST)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vli.vtype;
@ -1863,6 +1860,9 @@ public:
this->FinishInitNested(window_number);
if (this->vli.company != OWNER_NONE) this->owner = this->vli.company;
this->BuildVehicleList();
this->SortVehicleList();
}
~VehicleListWindow()