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

Fix script engine deletion

Browse source
This commit is contained in:
Zach Pomerantz 2016-04-28 11:41:36 -07:00
parent b95c81d0ba
commit 30e7b950a1
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ void ScriptEngine::runInThread() {
} }
_isThreaded = true; _isThreaded = true;
QThread* workerThread = new QThread(); // thread is not owned, so we need to manage the delete QThread* workerThread = new QThread(this); // thread is not owned, so we need to manage the delete
QString scriptEngineName = QString("Script Thread:") + getFilename(); QString scriptEngineName = QString("Script Thread:") + getFilename();
workerThread->setObjectName(scriptEngineName); workerThread->setObjectName(scriptEngineName);
@ -184,9 +184,6 @@ void ScriptEngine::runInThread() {
// tell the thread to stop when the script engine is done // tell the thread to stop when the script engine is done
connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit); connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit);
// when the thread is finished, add thread to the deleteLater queue
connect(workerThread, &QThread::finished, workerThread, &QThread::deleteLater);
moveToThread(workerThread); moveToThread(workerThread);
// Starts an event loop, and emits workerThread->started() // Starts an event loop, and emits workerThread->started()
@ -199,7 +196,7 @@ void ScriptEngine::waitTillDoneRunning() {
// NOTE: waitTillDoneRunning() will be called on the main Application thread, inside of stopAllScripts() // NOTE: waitTillDoneRunning() will be called on the main Application thread, inside of stopAllScripts()
// we want the application thread to continue to process events, because the scripts will likely need to // we want the application thread to continue to process events, because the scripts will likely need to
// marshall messages across to the main thread. For example if they access Settings or Meny in any of their // marshall messages across to the main thread. For example if they access Settings or Menu in any of their
// shutdown code. // shutdown code.
while (thread()->isRunning()) { while (thread()->isRunning()) {
// process events for the main application thread, allowing invokeMethod calls to pass between threads // process events for the main application thread, allowing invokeMethod calls to pass between threads