diff options
| author | smatz <smatz@openttd.org> | 2010-06-10 23:52:09 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-06-10 23:52:09 +0000 |
| commit | 8bf4a7d1ae5643b20d842f7fe9637e453614b8aa (patch) | |
| tree | 0e7db9b09c9e6d7497552dc55410d6f6f117a7dd /src/station.cpp | |
| parent | 830e40af1999186630b5a85e7c3017617fc44576 (diff) | |
| download | openttd-8bf4a7d1ae5643b20d842f7fe9637e453614b8aa.tar.xz | |
(svn r19956) -Fix: close list of vehicles with given oil rig in orders when the oil rig is deleted
-Fix (r19952): close the list when it is not sticky
Diffstat (limited to 'src/station.cpp')
| -rw-r--r-- | src/station.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/station.cpp b/src/station.cpp index 0dcc6daa0..b25f48a3f 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "company_func.h" +#include "company_base.h" #include "roadveh.h" #include "functions.h" #include "window_func.h" @@ -81,7 +82,10 @@ Station::~Station() InvalidateWindowData(WC_STATION_LIST, this->owner, 0); DeleteWindowById(WC_STATION_VIEW, index); - WindowNumber wno = (this->index << 16) | VLW_STATION_LIST | this->owner; + + Owner owner = this->owner; + if (!Company::IsValidID(owner)) owner = _local_company; + WindowNumber wno = (this->index << 16) | VLW_STATION_LIST | owner; DeleteWindowById(WC_TRAINS_LIST, wno | (VEH_TRAIN << 11)); DeleteWindowById(WC_ROADVEH_LIST, wno | (VEH_ROAD << 11)); DeleteWindowById(WC_SHIPS_LIST, wno | (VEH_SHIP << 11)); |