From d7a6ba47810f3b283eb57f4efec4e8ee64325304 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 2 Jul 2010 09:09:40 +0000 Subject: (svn r20041) -Fix [FS#3892](r19955): crash when spectator tried to open a vehicle list without selecting any company --- src/vehicle_gui.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 7d9e13e4a..8eb3d66b9 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1275,8 +1275,12 @@ static WindowDesc _vehicle_list_desc( static void ShowVehicleListWindowLocal(CompanyID company, uint16 VLW_flag, VehicleType vehicle_type, uint16 unique_number) { if (!Company::IsValidID(company)) { - _vehicle_list_desc.flags |= WDF_CONSTRUCTION; company = _local_company; + /* This can happen when opening the vehicle list as a spectator. + * While it would be cleaner to check this somewhere else, having + * it here reduces code duplication */ + if (!Company::IsValidID(company)) return; + _vehicle_list_desc.flags |= WDF_CONSTRUCTION; } else { _vehicle_list_desc.flags &= ~WDF_CONSTRUCTION; } -- cgit v1.2.3-70-g09d2