Merge remote-tracking branch 'warmist/patch-5' into develop

2015-10-22 20:02:12 -04:00 · 2015-10-22 20:02:12 -04:00 · a2007c369a
parent 757c05db86 5fbb950bc2
commit a2007c369a
1 changed files with 8 additions and 2 deletions
--- a/scripts/gui/gm-editor.lua
+++ b/scripts/gui/gm-editor.lua
@ -173,8 +173,14 @@ end
 function GmEditorUi:getSelectedEnumType()
    local trg=self:currentTarget()
    local trg_key=trg.keys[self.subviews.list_main:getSelected()]
-    if trg.target._field==nil then return nil end
-    if trg.target:_field(trg_key)==nil then return nil end
+        
+    local ok,ret=pcall(function () --super safe way to check if the field has enum
+        return trg.target._field==nil or trg.target:_field(trg_key)==nil
+    end)
+    if not ok or ret==true then
+        return nil
+    end
+    
    local enum=trg.target:_field(trg_key)._type
    if enum._kind=="enum-type" then
        return enum