Main: fix processMainThreadTasks() waiting logic

Co-authored-by: Guillaume Jacob <[email protected]>
tecnalia-medical-robotics · Sep 9, 2023 · 84645fd · 84645fd
1 parent 15631ca
commit 84645fd
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/OgreMain/src/OgreWorkQueue.cpp b/OgreMain/src/OgreWorkQueue.cpp
@@ -173,20 +173,17 @@ namespace Ogre {
         unsigned long msCurrent = 0;
 
         // keep going until we run out of responses or out of time
-        while(true)
+        while(!mMainThreadTasks.empty())
         {
-            if(!mMainThreadTasks.empty())
+            std::function<void()> task;
             {
-                std::function<void()> task;
-                {
-                    OGRE_WQ_LOCK_MUTEX(mResponseMutex);
-                    LogManager::getSingleton().stream(LML_TRIVIAL)
-                        << "DefaultWorkQueueBase('" << mName << "') - PROCESS_MAIN_TASK";
-                    task = std::move(mMainThreadTasks.front());
-                    mMainThreadTasks.pop_front();
-                }
-                task();
+                OGRE_WQ_LOCK_MUTEX(mResponseMutex);
+                LogManager::getSingleton().stream(LML_TRIVIAL)
+                    << "DefaultWorkQueueBase('" << mName << "') - PROCESS_MAIN_TASK";
+                task = std::move(mMainThreadTasks.front());
+                mMainThreadTasks.pop_front();
             }
+            task();
 
             // time limit
             if (mResposeTimeLimitMS)