cpp/openttd-patchpack/source Changeset - r27952:d3d7bbde9dcf

Changeset - r27952:d3d7bbde9dcf

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

PeterN - 9 months ago 2023-09-20 07:58:08
peter1138@openttd.org

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.

3 files changed with 8 insertions and 7 deletions:

src/group_gui.cpp

src/industry_gui.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/group_gui.cpp

➞

Show inline comments

@@ @@ -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()

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -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;
+	}

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -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()

0 comments (0 inline, 0 general)