From 47eabe0cd9fdb5e6dcd9b2c22f00e54564baba73 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 23 Nov 2023 22:46:22 +0000 Subject: [PATCH] Fix 7cfcf65: Check if last-remembered build vehicle cargo filter is valid. (#11486) This can be invalid when switching between games with different cargoes loaded. --- src/build_vehicle_gui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 3b2aa002d4..48fc622dc2 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1285,6 +1285,7 @@ struct BuildVehicleWindow : Window { { /* Set the last cargo filter criteria. */ this->cargo_filter_criteria = _engine_sort_last_cargo_criteria[this->vehicle_type]; + if (this->cargo_filter_criteria < NUM_CARGO && !HasBit(_standard_cargo_mask, this->cargo_filter_criteria)) this->cargo_filter_criteria = CF_ANY; this->eng_list.SetFilterFuncs(_filter_funcs); this->eng_list.SetFilterState(this->cargo_filter_criteria != CF_ANY);