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

Update ScriptEngine::stop() to always run on its thread

Browse source
This commit is contained in:
Ryan Huffman 2015-12-09 14:50:30 -08:00
parent e7a1550b64
commit a21e07327d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -775,6 +775,10 @@ void ScriptEngine::stopAllTimers() {
void ScriptEngine::stop() { void ScriptEngine::stop() {
if (!_isFinished) { if (!_isFinished) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "stop");
return;
}
_isFinished = true; _isFinished = true;
if (_wantSignals) { if (_wantSignals) {
emit runningStateChanged(); emit runningStateChanged();