History

Check entities scripting thread before signaling it

Zach Pomerantz committed 10 years ago

Commit 1e710711 parent 699c7172 files · +5 −3Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−1
@@ -154,7 +154,9 @@ ScriptEngine::~ScriptEngine() { · 153 unmodified lines
154 154
155void ScriptEngine::disconnectNonEssentialSignals() {155void ScriptEngine::disconnectNonEssentialSignals() {
156 disconnect();156 disconnect();
157 connect(this, &ScriptEngine::doneRunning, thread(), &QThread::quit);157 if (_isRunning && _isThreaded) { // ensure the thread is running
158 connect(this, &ScriptEngine::doneRunning, thread(), &QThread::quit);
159 }
158}160}
159 161
160void ScriptEngine::runInThread() {162void ScriptEngine::runInThread() {