From ba0f6c454de8d2a92b90c84cf16ea61cdbbdf7c8 Mon Sep 17 00:00:00 2001 From: Ada Date: Sun, 28 Jun 2026 19:42:49 +1000 Subject: [PATCH] comment out scope guard in `ScriptManager::waitTillDoneRunning` --- libraries/script-engine/src/ScriptManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptManager.cpp b/libraries/script-engine/src/ScriptManager.cpp index b7dae5e0584..e114b6c3bfb 100644 --- a/libraries/script-engine/src/ScriptManager.cpp +++ b/libraries/script-engine/src/ScriptManager.cpp @@ -550,8 +550,11 @@ void ScriptManager::waitTillDoneRunning(bool shutdown) { // if they access Settings or Menu in any of their shutdown code. So: // Process events for this thread, allowing invokeMethod calls to pass between threads. QCoreApplication::processEvents(); + // FIXME: this scope guard is causing deadlocks and removing + // it seems to not have any ill effect? another thread probably + // has a lock and this function is being called incorrectly // Events may use script engine so guard is necessary. - auto scopeGuard = _engine->getScopeGuard(); + // auto scopeGuard = _engine->getScopeGuard(); _engine->processEvents(); }