History

comment out scope guard in `ScriptManager::waitTillDoneRunning`

Ada committed 4 months ago

Commit dba277a1 parent 93340e01 file · +4 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+4−1
@@ -551,8 +551,11 @@ void ScriptManager::waitTillDoneRunning(bool shutdown) { · 550 unmodified lines
551551 // if they access Settings or Menu in any of their shutdown code. So:
552552 // Process events for this thread, allowing invokeMethod calls to pass between threads.
553553 QCoreApplication::processEvents();
554+ // FIXME: this scope guard is causing deadlocks and removing
555+ // it seems to not have any ill effect? another thread probably
556+ // has a lock and this function is being called incorrectly
554557 // Events may use script engine so guard is necessary.
555− auto scopeGuard = _engine->getScopeGuard();
558+ // auto scopeGuard = _engine->getScopeGuard();
556559 _engine->processEvents();
557560 }
558561