(svn r20041) -Fix [FS#3892](r19955): crash when spectator tried to open a vehicle list without selecting any company

This commit is contained in:
smatz 2010-07-02 09:09:40 +00:00
parent 7062bb0bd7
commit d7a6ba4781
1 changed files with 5 additions and 1 deletions

View File

@ -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;
}