Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7427 from huffman/fix-scriptengine-threading

Browse source 
Add protection around ScriptEngine::runInThread being called twice
This commit is contained in:
Brad Hefta-Gaub 2016-03-23 10:27:16 -07:00
commit 2e6c360708
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,6 +158,13 @@ void ScriptEngine::disconnectNonEssentialSignals() {
}
void ScriptEngine::runInThread() {
Q_ASSERT_X(!_isThreaded, "ScriptEngine::runInThread()", "runInThread should not be called more than once");
if (_isThreaded) {
qCWarning(scriptengine) << "ScriptEngine already running in thread: " << getFilename();
return;
}
_isThreaded = true;
QThread* workerThread = new QThread(); // thread is not owned, so we need to manage the delete
QString scriptEngineName = QString("Script Thread:") + getFilename();