From c8f2dae7bd4882999858b9716dbc82f7280d08db Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Sat, 17 May 2014 18:45:54 -0700 Subject: [PATCH 1/2] Fix for stopping scripts on Windows. --- interface/src/Application.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 17443b3cb0..0d5c75ec09 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3422,8 +3422,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript } // start the script on a new thread... - ScriptEngine* scriptEngine = new ScriptEngine(QUrl(scriptName), &_controllerScriptingInterface); - _scriptEnginesHash.insert(scriptName, scriptEngine); + QUrl scriptUrl(scriptName); + ScriptEngine* scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface); + _scriptEnginesHash.insert(scriptUrl.toString(), scriptEngine); if (!scriptEngine->hasScript()) { qDebug() << "Application::loadScript(), script failed to load..."; From 5ebb2659a4dffc2f60d203dec092a134378b6f78 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Sat, 17 May 2014 19:02:14 -0700 Subject: [PATCH 2/2] Fixed initialization order warning. --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0d5c75ec09..487965b3ec 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -169,8 +169,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _voxelHideShowThread(&_voxels), _packetsPerSecond(0), _bytesPerSecond(0), - _previousScriptLocation(), _nodeBoundsDisplay(this), + _previousScriptLocation(), _runningScriptsWidget(new RunningScriptsWidget(_window)), _runningScriptsWidgetWasVisible(false) {