Merge remote-tracking branch 'upstream/master'

2023-06-10 18:12:04 +04:00
parent 8473c05595 97085a19d5
commit 901d502412
89 changed files with 2143 additions and 931 deletions
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1969,7 +1969,7 @@ public:
 		this->SortVehicleList();

 		if (this->vehicles.size() == 0 && this->IsWidgetLowered(WID_VL_MANAGE_VEHICLES_DROPDOWN)) {
-			HideDropDownMenu(this);
+			this->CloseChildWindows(WC_DROPDOWN_MENU);
 		}

 		/* Hide the widgets that we will not use in this window