From 8d481843fd14f15ff6b50f678726361cd35ed034 Mon Sep 17 00:00:00 2001
From: -=yb4f310 <theunis.botha1@gmail.com>
Date: Sun, 4 Jun 2017 18:17:16 +0200
Subject: [PATCH] some gui checks

---
 src/game-lib-entity-manager.js |  4 ++++
 src/game-lib-gui.js            | 25 +++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/game-lib-entity-manager.js b/src/game-lib-entity-manager.js
index 398cb50..672047e 100644
--- a/src/game-lib-entity-manager.js
+++ b/src/game-lib-entity-manager.js
@@ -308,6 +308,10 @@ GameLib.EntityManager.FromObjectEntityManager = function(graphics, objectEntityM
     return entityManager;
 };
 
+/**
+ * Defines what should happen when a parent scene changes
+ * @param data
+ */
 GameLib.EntityManager.prototype.onParentSceneChange = function(data) {
 
 	if (data.object instanceof GameLib.D3.Mesh) {
diff --git a/src/game-lib-gui.js b/src/game-lib-gui.js
index a69e566..1575e22 100644
--- a/src/game-lib-gui.js
+++ b/src/game-lib-gui.js
@@ -774,8 +774,8 @@ GameLib.GUI.prototype.buildSelectControl = function(folder, object, property, en
                     /**
                      * Old way of doing things
                      */
-                    parentObject.buildIdToObject();
-                    object.updateInstance();
+                    //parentObject.buildIdToObject();
+                    //object.updateInstance();
                 }
 
                 /**
@@ -886,20 +886,37 @@ GameLib.GUI.prototype.build = function(entityManager) {
 		}.bind(this)
 	);
 
+	discoveredObjects.sort(
+		function(a, b) {
+			if (a.name > b.name) {
+				return 1;
+			}
+
+			if (a.name < b.name) {
+				return -1;
+			}
+
+			return 0;
+		}
+	);
+
 	discoveredObjects.map(
 
 		function(object) {
 
 			var apiObject = object.toApiObject();
 
+			if (typeof(apiObject) === 'string') {
+				return;
+			}
+
 			var folder = null;
 
 			try {
                 folder = this.instance.addFolder(apiObject.name);
             } catch (e) {
 			    console.log(e.message);
-			    apiObject.name += GameLib.Utils.RandomId(3);
-				folder = this.instance.addFolder(apiObject.name);
+			    return;
             }
 
             if (!folder) {