Changes in src/Actions/ActionQueue.cpp [06b5df:cfb9c5]

File:

• src/Actions/ActionQueue.cpp (modified) (4 diffs)

src/Actions/ActionQueue.cpp

@@ -98 +98 @@
 void ActionQueue::queueAction(const Action * const _action, enum Action::QueryOptions state)
 {
-  OBSERVE;
-  NOTIFY(ActionQueued);
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
@@ -123 +121 @@
     std::cerr << "ActionQueue cleared." << std::endl;
   }
+  if (lastActionOk) {
+    OBSERVE;
+    NOTIFY(ActionQueued);
+    _lastchangedaction = newaction;
+  }
 #else
   {
@@ -130 +133 @@
   mtx_queue.unlock();
 #endif
-  _lastchangedaction = newaction;
 }
 
@@ -193 +195 @@
         CurrentAction = (size_t)-1;
       }
+      if (lastActionOk) {
+        OBSERVE;
+        NOTIFY(ActionQueued);
+        _lastchangedaction = actionqueue[CurrentAction];
+      }
       // access actionqueue, hence using mutex
       mtx_queue.lock();