Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ScriptEngine::finished to include

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

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

@ -183,7 +183,7 @@ void ScriptEngine::runInThread() {
QSet<ScriptEngine*> ScriptEngine::_allKnownScriptEngines; QSet<ScriptEngine*> ScriptEngine::_allKnownScriptEngines;
QMutex ScriptEngine::_allScriptsMutex; QMutex ScriptEngine::_allScriptsMutex;
std::atomic<bool> ScriptEngine::_stoppingAllScripts = false; std::atomic<bool> ScriptEngine::_stoppingAllScripts { false };
void ScriptEngine::stopAllScripts(QObject* application) { void ScriptEngine::stopAllScripts(QObject* application) {
_allScriptsMutex.lock(); _allScriptsMutex.lock();
@ -752,7 +752,7 @@ void ScriptEngine::run() {
} }
if (_wantSignals) { if (_wantSignals) {
emit finished(_fileNameString); emit finished(_fileNameString, this);
} }
_isRunning = false; _isRunning = false;

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -153,7 +153,7 @@ signals:
void errorLoadingScript(const QString& scriptFilename); void errorLoadingScript(const QString& scriptFilename);
void update(float deltaTime); void update(float deltaTime);
void scriptEnding(); void scriptEnding();
void finished(const QString& fileNameString); void finished(const QString& fileNameString, ScriptEngine* engine);
void cleanupMenuItem(const QString& menuItemString); void cleanupMenuItem(const QString& menuItemString);
void printedMessage(const QString& message); void printedMessage(const QString& message);
void errorMessage(const QString& message); void errorMessage(const QString& message);