From 7ed5f6edf9990e3b42180d23d9e00b4bf6c89533 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Sun, 13 Oct 2013 11:05:20 +0000 Subject: (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) --- src/order_gui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 8f0ef7a2c..d129319cd 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -496,6 +496,7 @@ struct OrdersWindow : public Window { private: /** Under what reason are we using the PlaceObject functionality? */ enum OrderPlaceObjectState { + OPOS_NONE, OPOS_GOTO, OPOS_CONDITIONAL, OPOS_SHARE, @@ -818,6 +819,7 @@ public: this->selected_order = -1; this->order_over = INVALID_VEH_ORDER_ID; + this->goto_type = OPOS_NONE; this->owner = v->owner; this->UpdateAutoRefitState(); @@ -1197,7 +1199,6 @@ public: switch (widget) { case WID_O_ORDER_LIST: { if (this->goto_type == OPOS_CONDITIONAL) { - this->goto_type = OPOS_GOTO; VehicleOrderID order_id = this->GetOrderFromPt(_cursor.pos.y - this->top); if (order_id != INVALID_VEH_ORDER_ID) { Order order; @@ -1499,6 +1500,7 @@ public: virtual void OnPlaceObjectAbort() { + this->goto_type = OPOS_NONE; this->RaiseWidget(WID_O_GOTO); this->SetWidgetDirty(WID_O_GOTO); -- cgit v1.2.3-70-g09d2