Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread

Browse source 
(BUGZ-619) Fix potential crash when ending script on main thread
This commit is contained in:
Shannon Romano 2019-06-21 15:08:42 -07:00 committed by GitHub
commit 13615eb9ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -397,15 +397,20 @@ void ScriptEngine::executeOnScriptThread(std::function<void()> function, const Q
}
void ScriptEngine::waitTillDoneRunning() {
// Engine should be stopped already, but be defensive
stop();
auto workerThread = thread();
if (workerThread == QThread::currentThread()) {
qCWarning(scriptengine) << "ScriptEngine::waitTillDoneRunning called, but the script is on the same thread:" << getFilename();
return;
}
if (_isThreaded && workerThread) {
// We should never be waiting (blocking) on our own thread
assert(workerThread != QThread::currentThread());
// Engine should be stopped already, but be defensive
stop();
auto startedWaiting = usecTimestampNow();
while (workerThread->isRunning()) {
// If the final evaluation takes too long, then tell the script engine to stop running