v2.7.4: Fixed critical crash in queueTask

MCJack123 · May 14, 2023 · 369b054 · 369b054
1 parent 3c79f2b
commit 369b054
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/runtime.cpp b/src/runtime.cpp
@@ -67,7 +67,7 @@ monitor * findMonitorFromWindowID(Computer *comp, unsigned id, std::string* side
 }
 
 void* queueTask(const std::function<void*(void*)>& func, void* arg, bool async) {
-    if (std::this_thread::get_id() == mainThreadID && !async) return func(arg);
+    if (std::this_thread::get_id() == mainThreadID && (!async || taskQueue.locked())) return func(arg);
     TaskQueueItem * task = new TaskQueueItem;
     task->func = func;
     task->data = arg;

diff --git a/vcpkg.json b/vcpkg.json
@@ -32,7 +32,7 @@
                 {
                     "name": "sdl2-mixer",
                     "default-features": true,
-                    "features": [ "libmodplug", "opusfile", "fluidsynth" ]
+                    "features": [ "libmodplug", "opusfile", "fluidsynth", "libflac", "mpg123" ]
                 }
             ]
         },