Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix method name to match coding standard

Browse source
This commit is contained in:
Seth Alves 2016-05-19 16:08:44 -07:00
parent 4e862941cb
commit 9ad488ba7b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ public:
bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget
bool isRunning() const { return _isRunning; } // used by ScriptWidget bool isRunning() const { return _isRunning; } // used by ScriptWidget
bool isStopping() const { return _isStopping; } bool isStopping() const { return _isStopping; }
void flagAsStopping() { _isStopping = true; } void setIsStopping() { _isStopping = true; }
bool isDebuggable() const { return _debuggable; } bool isDebuggable() const { return _debuggable; }

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

@ -351,7 +351,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
reloadScript(scriptName); reloadScript(scriptName);
}); });
} }
it.value()->flagAsStopping(); it.value()->setIsStopping();
QMetaObject::invokeMethod(it.value(), "stop"); QMetaObject::invokeMethod(it.value(), "stop");
//it.value()->stop(); //it.value()->stop();
qCDebug(scriptengine) << "stopping script..." << it.key(); qCDebug(scriptengine) << "stopping script..." << it.key();
@ -370,7 +370,7 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
if (_scriptEnginesHash.contains(scriptURL)) { if (_scriptEnginesHash.contains(scriptURL)) {
ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL]; ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL];
if (restart) { if (restart) {
scriptEngine->flagAsStopping(); scriptEngine->setIsStopping();
auto scriptCache = DependencyManager::get<ScriptCache>(); auto scriptCache = DependencyManager::get<ScriptCache>();
scriptCache->deleteScript(scriptURL); scriptCache->deleteScript(scriptURL);
connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) { connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {