History

merge with master

SamGondelman committed 8 years ago

Commit c522d1b2 parents b3bdddb 568b5b9312 files · +6941 −3153Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 312 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -271,7 +271,7 @@ void ScriptEngine::disconnectNonEssentialSignals() { · 270 unmodified lines
271271 // Ensure the thread should be running, and does exist
272272 if (_isRunning && _isThreaded && (workerThread = thread())) {
273273 connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit);
274− connect(this, &QObject::destroyed, workerThread, &QObject::deleteLater);
274+ connect(workerThread, &QThread::finished, workerThread, &QObject::deleteLater);
275275 }
276276 }
277277
@@ -386,7 +386,7 @@ void ScriptEngine::runInThread() { · 108 unmodified lines
386386 // disconnectNonEssentialSignals() method
387387 connect(workerThread, &QThread::started, this, &ScriptEngine::run);
388388 connect(this, &ScriptEngine::doneRunning, workerThread, &QThread::quit);
389− connect(this, &QObject::destroyed, workerThread, &QObject::deleteLater);
389+ connect(workerThread, &QThread::finished, workerThread, &QObject::deleteLater);
390390
391391 workerThread->start();
392392 }