Merge tag '1.11.1' into 1.11

2021-04-25 22:58:47 +03:00
parent 6ad10ffb54 0be22efffc
commit 561ce3ee7f
150 changed files with 1525 additions and 616 deletions
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1831,12 +1831,18 @@ public:
 						break;
 					}

-					case GB_SHARED_ORDERS:
+					case GB_SHARED_ORDERS: {
 						assert(vehgroup.NumVehicles() > 0);
+						const Vehicle *v = vehgroup.vehicles_begin[0];
 						/* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */

-						ShowVehicleListWindow(vehgroup.vehicles_begin[0]);
+						if (vehgroup.NumVehicles() == 1) {
+							ShowVehicleViewWindow(v);
+						} else {
+							ShowVehicleListWindow(v);
+						}
 						break;
+					}

 					default: NOT_REACHED();
 				}