# HG changeset patch # User planetmaker # Date 2013-10-13 11:05:20 # Node ID 30aef650fcaf3ec66f4ed21ec9fd026ba0c1e4e1 # Parent d0f492ae6be5c0bb3298b53ac339c675b4205370 (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) diff --git a/src/order_gui.cpp b/src/order_gui.cpp --- 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);