GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Fix nil dereferencing exception in Frames.lua #26

Merged
Yarillo4 merged 1 commits from master into master 2022-08-17 02:24:22 +08:00
Conversation 2 Commits 1 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Basalt/Frame.lua
View File

@@ -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