From a0c6259e3356d73b47dceb99594abd9a67a7b377 Mon Sep 17 00:00:00 2001
From: PeterN <peter1138@openttd.org>
Date: Wed, 20 Sep 2023 08:58:08 +0100
Subject: [PATCH] Codechange: Don't access cargo filter before it is
 initialized. (#11321)

The cargo filter list is initialized during window OnInit, but the first
build of the filtered list occurred before this.
---
 src/group_gui.cpp    | 6 +++---
 src/industry_gui.cpp | 3 ++-
 src/vehicle_gui.cpp  | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index c52153fe2f..ffd965590f 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -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()
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 8526a95c8b..c847a6eb6d 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -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;
 	}
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 017dd1b33f..7010610d11 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -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()