History

Add missing script engine hash key code changes

The script engine hash key changed starting at commit [62f85d] on 11 Jun.

David Rowe committed 12 years ago

Commit 9449ad71 parent 9eba4b02 files · +6 −3Browse files

Showing the changes to interface/src/ui/ScriptEditorWidget.cpp (1 of 2 files). Show all

Unified · Split

interface/src/ui/ScriptEditorWidget.cpp+4−2
@@ -84,7 +84,8 @@ bool ScriptEditorWidget::setRunning(bool run) { · 83 unmodified lines
84 }84 }
85 85
86 if (run) {86 if (run) {
87 _scriptEngine = Application::getInstance()->loadScript(_currentScript, true);87 const QString& scriptURLString = QUrl(_currentScript).toString();
88 _scriptEngine = Application::getInstance()->loadScript(scriptURLString, true);
88 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);89 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
89 90
90 // Make new connections.91 // Make new connections.
@@ -148,7 +149,8 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 57 unmodified lines
148 }149 }
149 }150 }
150 151
151 _scriptEngine = Application::getInstance()->getScriptEngine(_currentScript);152 const QString& scriptURLString = QUrl(_currentScript).toString();
153 _scriptEngine = Application::getInstance()->getScriptEngine(scriptURLString);
152 if (_scriptEngine != NULL) {154 if (_scriptEngine != NULL) {
153 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);155 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
154 connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);156 connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);