From 9faee0d82d9a42938778075f5bc43d38bf16e21d Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Mon, 21 Apr 2014 21:37:49 +0200
Subject: [PATCH] - Style - Script Editor can run script file once at time, but
 you can still start multiple scripts through the original ways.

---
 interface/src/Application.cpp           | 6 +++---
 interface/src/Application.h             | 2 +-
 interface/src/ui/ScriptEditorWidget.cpp | 2 +-
 interface/src/ui/ScriptEditorWindow.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 79d3e7597e..4ba465bbe1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3377,8 +3377,8 @@ void Application::uploadSkeleton() {
     uploadFST(false);
 }
 
-ScriptEngine* Application::loadScript(const QString& scriptName, bool focusMainWindow) {
-    if(_scriptEnginesHash.contains(scriptName) && !_scriptEnginesHash[scriptName]->isFinished()){
+ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) {
+    if(loadScriptFromEditor && _scriptEnginesHash.contains(scriptName) && !_scriptEnginesHash[scriptName]->isFinished()){
         return _scriptEnginesHash[scriptName];
     }
 
@@ -3436,7 +3436,7 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool focusMainW
     workerThread->start();
 
     // restore the main window's active state
-    if (focusMainWindow) {
+    if (!loadScriptFromEditor) {
         _window->activateWindow();
     }
     bumpSettings();
diff --git a/interface/src/Application.h b/interface/src/Application.h
index e66e7e2975..fb48acb721 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -121,7 +121,7 @@ public:
     ~Application();
 
     void restoreSizeAndPosition();
-    ScriptEngine* loadScript(const QString& fileNameString, bool focusMainWindow = true);
+    ScriptEngine* loadScript(const QString& fileNameString, bool loadScriptFromEditor = false);
     void loadScripts();
     void storeSizeAndPosition();
     void clearScriptsBeforeRunning();
diff --git a/interface/src/ui/ScriptEditorWidget.cpp b/interface/src/ui/ScriptEditorWidget.cpp
index d24c68a613..74b74e1ad6 100644
--- a/interface/src/ui/ScriptEditorWidget.cpp
+++ b/interface/src/ui/ScriptEditorWidget.cpp
@@ -71,7 +71,7 @@ bool ScriptEditorWidget::setRunning(bool run) {
     disconnect(this, SLOT(onScriptPrint(const QString&)));
 
     if (run) {
-        _scriptEngine = Application::getInstance()->loadScript(_currentScript, false);
+        _scriptEngine = Application::getInstance()->loadScript(_currentScript, true);
         connect(_scriptEngine, SIGNAL(runningStateChanged()), this, SIGNAL(runningStateChanged()));
 
         // Make new connections.
diff --git a/interface/src/ui/ScriptEditorWindow.cpp b/interface/src/ui/ScriptEditorWindow.cpp
index 00a3ef9f0c..26488f0223 100644
--- a/interface/src/ui/ScriptEditorWindow.cpp
+++ b/interface/src/ui/ScriptEditorWindow.cpp
@@ -180,11 +180,11 @@ void ScriptEditorWindow::closeEvent(QCloseEvent *event) {
 
 void ScriptEditorWindow::updateScriptNameOrStatus() {
     ScriptEditorWidget* source = (ScriptEditorWidget*)QObject::sender();
-    QString modifiedStar = (source->isModified()?"*":"");
+    QString modifiedStar = (source->isModified()? "*" : "");
     if (source->getScriptName().length() > 0) {
         for (int i = 0; i < _ScriptEditorWindowUI->tabWidget->count(); i++){
             if (_ScriptEditorWindowUI->tabWidget->widget(i) == source) {
-                _ScriptEditorWindowUI->tabWidget->setTabText(i,modifiedStar + QFileInfo(source->getScriptName()).fileName());
+                _ScriptEditorWindowUI->tabWidget->setTabText(i, modifiedStar + QFileInfo(source->getScriptName()).fileName());
                 _ScriptEditorWindowUI->tabWidget->setTabToolTip(i, source->getScriptName());
             }
         }