Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13964 from dback2/reloadScriptQThreadCrash

Browse source 
Destroy script thread on finish instead of on ScriptEngine destroyed
This commit is contained in:
John Conklin II 2018-09-10 14:11:37 -07:00 committed by GitHub
commit 558f3dc7e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ void ScriptEngine::disconnectNonEssentialSignals() {
// Ensure the thread should be running, and does exist
if (_isRunning && _isThreaded && (workerThread = thread())) {
connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit);
connect(this, &QObject::destroyed, workerThread, &QObject::deleteLater);
connect(workerThread, &QThread::finished, workerThread, &QObject::deleteLater);
}
}
@ -386,7 +386,7 @@ void ScriptEngine::runInThread() {
// disconnectNonEssentialSignals() method
connect(workerThread, &QThread::started, this, &ScriptEngine::run);
connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit);
connect(this, &QObject::destroyed, workerThread, &QObject::deleteLater);
connect(workerThread, &QThread::finished, workerThread, &QObject::deleteLater);
workerThread->start();
}