From e9a4f865b0ac8455f9c5c5580cbc2c51cea3e91c Mon Sep 17 00:00:00 2001
From: SamuXarick <43006711+SamuXarick@users.noreply.github.com>
Date: Tue, 2 Jan 2024 20:46:18 +0000
Subject: [PATCH] Codechange: Simply check whether the group vehicle list is
 empty for ToolbarVehicleClick

---
 src/toolbar_gui.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 4ca6ad5383..874a479e6f 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -730,8 +730,8 @@ static void ToolbarVehicleClick(Window *w, VehicleType veh)
 {
 	int dis = ~0;
 
-	for (const Vehicle *v : Vehicle::Iterate()) {
-		if (v->type == veh && v->IsPrimaryVehicle()) ClrBit(dis, v->owner);
+	for (const Company *c : Company::Iterate()) {
+		if (!c->group_all[veh].vehicle_list.empty()) ClrBit(dis, c->index);
 	}
 	PopupMainCompanyToolbMenu(w, WID_TN_VEHICLE_START + veh, dis);
 }