Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 1 file). Show all
Unified · Split
| @@ -551,8 +551,11 @@ void ScriptManager::waitTillDoneRunning(bool shutdown) { · 550 unmodified lines | |||
| 551 | // if they access Settings or Menu in any of their shutdown code. So: | 551 | // if they access Settings or Menu in any of their shutdown code. So: |
| 552 | // Process events for this thread, allowing invokeMethod calls to pass between threads. | 552 | // Process events for this thread, allowing invokeMethod calls to pass between threads. |
| 553 | QCoreApplication::processEvents(); | 553 | 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 | ||
| 554 | // Events may use script engine so guard is necessary. | 557 | // Events may use script engine so guard is necessary. |
| 555 | auto scopeGuard = _engine->getScopeGuard(); | 558 | // auto scopeGuard = _engine->getScopeGuard(); |
| 556 | _engine->processEvents(); | 559 | _engine->processEvents(); |
| 557 | } | 560 | } |
| 558 | 561 | ||