From 07599c02c83a735d66179de37bba6d6bcbc0fc45 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 5 Dec 2018 08:16:54 -0800
Subject: [PATCH] true reversion of scrips param

---
 interface/src/Application.cpp                 | 7 ++++++-
 libraries/script-engine/src/ScriptEngines.cpp | 5 +----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 790a93ad5a..455a31cf40 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5279,7 +5279,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
         // this will force the model the look at the correct directory (weird order of operations issue)
         scriptEngines->reloadLocalFiles();
 
-        scriptEngines->loadScripts();
+        if (!_defaultScriptsLocation.exists()) {
+            scriptEngines->loadDefaultScripts();
+            scriptEngines->defaultScriptsLocationOverridden(true);
+        } else {
+            scriptEngines->loadScripts();
+        }
     }
 
     if (_firstRun.get()) {
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 2b3a5e5e53..4592088aee 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -319,13 +319,10 @@ void ScriptEngines::loadScripts() {
 
     // loads all saved scripts
     auto runningScripts = runningScriptsHandle.get();
-    if (runningScripts.empty()) {
-        loadDefaultScripts();
-        return;
-    }
 
     for (auto script : runningScripts) {
         auto string = script.toString();
+        qDebug() << string;
         if (!string.isEmpty()) {
             loadScript(string);
         }