From 12f578c93c825feabf420b9f8548b597ad7b69d0 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Wed, 25 Apr 2018 19:46:31 -0700
Subject: [PATCH] More fixes

---
 interface/src/Application.cpp     | 18 ++++++++----------
 interface/src/avatar/MyAvatar.cpp |  2 +-
 interface/src/avatar/MyAvatar.h   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ad4cb56703..c38bb9295a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4731,16 +4731,14 @@ void Application::init() {
 }
 
 void Application::loadAvatarScripts(const QVector<QString>& urls) {
-    if (auto avatar = getMyAvatar()) {
-        if (urls.size() > 0) {
-            auto scriptEngines = DependencyManager::get<ScriptEngines>();
-            auto runningScripts = scriptEngines->getRunningScripts();
-            for (auto url : urls) {
-                int index = runningScripts.indexOf(url);
-                if (index < 0) {
-                    scriptEngines->loadScript(url);
-                    avatar->addScriptToUnload(url);
-                }
+    if (urls.size() > 0) {
+        auto scriptEngines = DependencyManager::get<ScriptEngines>();
+        auto runningScripts = scriptEngines->getRunningScripts();
+        for (auto url : urls) {
+            int index = runningScripts.indexOf(url);
+            if (index < 0) {
+                scriptEngines->loadScript(url);
+                getMyAvatar()->addScriptToUnload(url);
             }
         }
     }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 69acf26477..462dbebbbb 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -2838,7 +2838,7 @@ float MyAvatar::getWalkSpeed() const {
     return _walkSpeed.get() * _walkSpeedScalar;
 }
 
-void MyAvatar::addScriptToUnload(QString& url) {
+void MyAvatar::addScriptToUnload(const QString& url) {
     _scriptsToUnload.push_back(url);
 }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 6e67defe6f..00cb50e079 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -594,7 +594,7 @@ public:
     void setWalkSpeed(float value);
     float getWalkSpeed() const;
 
-    void addScriptToUnload(QString& url);
+    void addScriptToUnload(const QString& url);
     const QVector<QString>& getScriptsToUnload() const { return _scriptsToUnload; };
 
 public slots: