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

Merge pull request #26 from Yarillo4/master

Browse Source 
Fix nil dereferencing exception in Frames.lua
This commit is contained in:
Robert Jelic
2022-08-16 20:24:22 +02:00
committed by GitHub
parent b64f3ef87c 6809f9991b
commit 9d7c7d8a85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Basalt/Frame.lua
View File

@@ -280,7 +280,7 @@ return function(name, parent, pTerm, basalt)
end, end,
getTheme = function(self, name) 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, end,
setPosition = function(self, x, y, rel) setPosition = function(self, x, y, rel)