summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-01-02 20:01:28 +0000
committerrubidium <rubidium@openttd.org>2009-01-02 20:01:28 +0000
commit80a35db52c8e2f88482fb63b5dee17c81be541f9 (patch)
treedaaeb66b2873456797115cc1cf75e2f8b6212e44
parent7ab7c4e6ff0d20e01ef0f95cd9cbe88608199125 (diff)
downloadopenttd-80a35db52c8e2f88482fb63b5dee17c81be541f9.tar.xz
(svn r14784) -Change: don't close and reopen the vehicle order/detail windows, just refocus them instead.
-rw-r--r--src/order_gui.cpp6
-rw-r--r--src/vehicle_gui.cpp1
2 files changed, 2 insertions, 5 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 7c58aa293..e31114b45 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1267,10 +1267,8 @@ static const WindowDesc _other_orders_desc = {
void ShowOrdersWindow(const Vehicle *v)
{
- VehicleID veh = v->index;
-
- DeleteWindowById(WC_VEHICLE_ORDERS, veh);
- DeleteWindowById(WC_VEHICLE_DETAILS, veh);
+ DeleteWindowById(WC_VEHICLE_DETAILS, v->index);
+ if (BringWindowToFrontById(WC_VEHICLE_ORDERS, v->index) != NULL) return;
if (v->owner != _local_company) {
new OrdersWindow(&_other_orders_desc, v);
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 8301fa86a..afa4e31d3 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1553,7 +1553,6 @@ static const WindowDesc _vehicle_details_desc = {
static void ShowVehicleDetailsWindow(const Vehicle *v)
{
DeleteWindowById(WC_VEHICLE_ORDERS, v->index);
- DeleteWindowById(WC_VEHICLE_DETAILS, v->index);
AllocateWindowDescFront<VehicleDetailsWindow>(&_vehicle_details_desc, v->index);
}