Merge branch 'master' into ammo_graph

2020-01-21 15:25:39 +03:00
parent 78423f67dd 0fe54631ad
commit eacc97160b
64 changed files with 2392149 additions and 3277152 deletions
--- a/gui/builtinViews/entityEditor.py
+++ b/gui/builtinViews/entityEditor.py
@@ -178,10 +178,17 @@ class EntityEditor(wx.Panel):
        return True

    def checkEntitiesExist(self):
-        if len(self.choices) == 0:
-            self.Parent.Hide()
-            if self.OnNew(None) is False:
-                return False
-            self.Parent.Show()
+        if len(self.choices) > 0:
+            return True
+        else:
+            return self.enterNewEntity()
+
+    def enterNewEntity(self):
+        self.Parent.Hide()
+        if self.OnNew(None) is False:
+            return False
+        self.Parent.Show()

        return True
+
+