From 8bf4a7d1ae5643b20d842f7fe9637e453614b8aa Mon Sep 17 00:00:00 2001 From: smatz Date: Thu, 10 Jun 2010 23:52:09 +0000 Subject: (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 --- src/waypoint.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/waypoint.cpp') diff --git a/src/waypoint.cpp b/src/waypoint.cpp index a22edcb48..6ed11799b 100644 --- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -17,6 +17,7 @@ #include "waypoint_base.h" #include "vehicle_gui.h" #include "company_func.h" +#include "company_base.h" /** * Draw a waypoint @@ -55,7 +56,9 @@ Waypoint::~Waypoint() DeleteWindowById(WC_WAYPOINT_VIEW, this->index); RemoveOrderFromAllVehicles(OT_GOTO_WAYPOINT, this->index); - WindowNumber wno = (this->index << 16) | VLW_WAYPOINT_LIST | (this->owner == OWNER_NONE ? _local_company : this->owner); + Owner owner = this->owner; + if (!Company::IsValidID(owner)) owner = _local_company; + WindowNumber wno = (this->index << 16) | VLW_WAYPOINT_LIST | owner; DeleteWindowById(WC_TRAINS_LIST, wno | (VEH_TRAIN << 11)); DeleteWindowById(WC_SHIPS_LIST, wno | (VEH_SHIP << 11)); -- cgit v1.2.3-54-g00ecf