Changeset 419fa2

Timestamp:

Jan 30, 2015, 1:53:24 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

6bbdfb

Parents:

7e6c0d

Message:

tempcommit: Fixing access to clearQueue() which deadlocked before.

File:

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

src/Actions/ActionQueue.cpp ¶

@@ -205 +205 @@
         pushStatus("FAIL: Action "+*boost::get_error_info<ActionNameString>(e)+" has failed.");
         World::getInstance().setExitFlag(5);
-        clearQueue(CurrentAction);
-        clearTempQueue();
         lastActionOk = false;
         std::cerr << "Remaining Actions cleared from queue." << std::endl;
@@ -212 +210 @@
         pushStatus("FAIL: General exception caught, aborting.");
         World::getInstance().setExitFlag(134);
-        clearQueue(CurrentAction);
-        clearTempQueue();
         std::cerr << "Remaining Actions cleared from queue." << std::endl;
       }
@@ -219 +215 @@
       const Action *lastaction = actionqueue[CurrentAction];
       // step on to next action and check for end
-      CurrentAction++;
+      if (lastActionOk)
+        CurrentAction++;
       // insert new actions (before [CurrentAction]) if they have been spawned
       // we must have an extra vector for this, as we cannot change actionqueue
       // while an action instance is "in-use"
       mtx_actionqueue.unlock();
+
+      if (!lastActionOk) {
+        clearQueue(CurrentAction);
+        clearTempQueue();
+      }
 
       insertTempQueue();