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

Add missing script engine hash key code changes

Browse source 
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
This commit is contained in:
David Rowe 2014-06-29 19:40:53 -07:00
parent 9eba4b01f0
commit 9449ad7192
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -3628,7 +3628,8 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
} }
void Application::scriptFinished(const QString& scriptName) { void Application::scriptFinished(const QString& scriptName) {
QHash<QString, ScriptEngine*>::iterator it = _scriptEnginesHash.find(scriptName); const QString& scriptURLString = QUrl(scriptName).toString();
QHash<QString, ScriptEngine*>::iterator it = _scriptEnginesHash.find(scriptURLString);
if (it != _scriptEnginesHash.end()) { if (it != _scriptEnginesHash.end()) {
_scriptEnginesHash.erase(it); _scriptEnginesHash.erase(it);
_runningScriptsWidget->scriptStopped(scriptName); _runningScriptsWidget->scriptStopped(scriptName);

6
interface/src/ui/ScriptEditorWidget.cpp
View file

@ -84,7 +84,8 @@ bool ScriptEditorWidget::setRunning(bool run) {
} }
if (run) { if (run) {
_scriptEngine = Application::getInstance()->loadScript(_currentScript, true); const QString& scriptURLString = QUrl(_currentScript).toString();
_scriptEngine = Application::getInstance()->loadScript(scriptURLString, true);
connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
// Make new connections. // Make new connections.
@ -148,7 +149,8 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) {
} }
} }
_scriptEngine = Application::getInstance()->getScriptEngine(_currentScript); const QString& scriptURLString = QUrl(_currentScript).toString();
_scriptEngine = Application::getInstance()->getScriptEngine(scriptURLString);
if (_scriptEngine != NULL) { if (_scriptEngine != NULL) {
connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);