Merge pull request #26 from Yarillo4/master

Fix nil dereferencing exception in Frames.lua
2022-08-16 20:24:22 +02:00
parent b64f3ef87c 6809f9991b
commit 9d7c7d8a85
1 changed files with 2 additions and 2 deletions
--- a/Basalt/Frame.lua
+++ b/Basalt/Frame.lua
@@ -280,7 +280,7 @@ return function(name, parent, pTerm, basalt)
        end,

        getTheme = function(self, name)
-            return theme[name] or (self.parent~=nil and self.parent:getTheme(name) or basalt.getTheme(name))
+            return (theme and theme[name]) or (self.parent~=nil and self.parent:getTheme(name) or basalt.getTheme(name))
        end,

        setPosition = function(self, x, y, rel)
@@ -877,4 +877,4 @@ return function(name, parent, pTerm, basalt)
    end
    setmetatable(object, base)
    return object
-end
+end