Lua themes with no options wouldn't load anymore (got broken in b4939… (#5351)
* Lua themes with no options wouldn't load anymore (got broken in b493973d7d)
* Keep protection
* Changes according to PR comments
This commit is contained in:
committed by
Bertrand Songis
parent
f7828ad4a3
commit
7f4daf3f5b
@@ -234,14 +234,17 @@ void luaLoadThemeCallback()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (name) {
|
if (name) {
|
||||||
ZoneOption * options = createOptionsArray(themeOptions, MAX_THEME_OPTIONS);
|
ZoneOption * options = NULL;
|
||||||
if (options) {
|
if (themeOptions) {
|
||||||
LuaTheme * theme = new LuaTheme(name, options);
|
options = createOptionsArray(themeOptions, MAX_THEME_OPTIONS);
|
||||||
theme->loadFunction = loadFunction;
|
if (!options)
|
||||||
theme->drawBackgroundFunction = drawBackgroundFunction;
|
return;
|
||||||
theme->drawTopbarBackgroundFunction = drawTopbarBackgroundFunction;
|
|
||||||
TRACE("Loaded Lua theme %s", name);
|
|
||||||
}
|
}
|
||||||
|
LuaTheme * theme = new LuaTheme(name, options);
|
||||||
|
theme->loadFunction = loadFunction;
|
||||||
|
theme->drawBackgroundFunction = drawBackgroundFunction;
|
||||||
|
theme->drawTopbarBackgroundFunction = drawTopbarBackgroundFunction;
|
||||||
|
TRACE("Loaded Lua theme %s", name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user