Skip to content

comment out scope guard in ScriptManager::waitTillDoneRunning #2355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ada-tv wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Draft

comment out scope guard in ScriptManager::waitTillDoneRunning #2355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion libraries/script-engine/src/ScriptManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Loading