From 7a9d77fed49f4e7d90ff4e16833a70b54d0719a2 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 7 Dec 2017 17:53:30 -0800
Subject: [PATCH] return a legit selectedItemsList js object as long as the
 list exist, only void if the list name is unknown

---
 .../scripting/SelectionScriptingInterface.cpp | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp
index 6f2696f2f5..b7613cc3ae 100644
--- a/interface/src/scripting/SelectionScriptingInterface.cpp
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -247,35 +247,32 @@ QVariantMap SelectionScriptingInterface::getSelectedItemsList(const QString& lis
     QVariantMap list;
     auto currentList = _selectedItemsListMap.find(listName);
     if (currentList != _selectedItemsListMap.end()) {
-        if ((*currentList).getContainsData()) {
+        QList<QVariant> avatarIDs;
+        QList<QVariant> entityIDs;
+        QList<QVariant> overlayIDs;
 
+        if ((*currentList).getContainsData()) {
             if (!(*currentList).getAvatarIDs().empty()) {
-                QList<QVariant> avatarIDs;
                 for (auto j : (*currentList).getAvatarIDs()) {
                     avatarIDs.push_back((QUuid)j);
                 }
-                list["avatars"] = (avatarIDs);
             }
             if (!(*currentList).getEntityIDs().empty()) {
-                QList<QVariant> entityIDs;
                 for (auto j : (*currentList).getEntityIDs()) {
                     entityIDs.push_back((QUuid)j );
                 }
-                list["entities"] = (entityIDs);
             }
             if (!(*currentList).getOverlayIDs().empty()) {
-                QList<QVariant> overlayIDs;
                 for (auto j : (*currentList).getOverlayIDs()) {
                     overlayIDs.push_back((QUuid)j);
                 }
-                list["overlays"] = (overlayIDs);
             }
+        }
+        list["avatars"] = (avatarIDs);
+        list["entities"] = (entityIDs);
+        list["overlays"] = (overlayIDs);
 
-            return list;
-        }
-        else {
-            return list;
-        }
+        return list;
     }
     else {
         return list;