diff options
| -rw-r--r-- | gui/ThemeEval.cpp | 2 | ||||
| -rw-r--r-- | gui/ThemeParser.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gui/ThemeEval.cpp b/gui/ThemeEval.cpp index 40b671c8c3..4437809599 100644 --- a/gui/ThemeEval.cpp +++ b/gui/ThemeEval.cpp @@ -151,6 +151,8 @@ void ThemeEval::addLayout(ThemeLayout::LayoutType type, int spacing, bool center layout = new ThemeLayoutVertical(_curLayout.top(), spacing, center); else if (type == ThemeLayout::kLayoutHorizontal) layout = new ThemeLayoutHorizontal(_curLayout.top(), spacing, center); + + assert(layout); layout->setPadding( getVar("Globals.Padding.Left", 0), diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index 07eb56f781..627e7dc210 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -605,7 +605,10 @@ bool ThemeParser::parserCallback_layout(ParserNode *node) { else if (node->values["type"] == "horizontal") _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, node->values["center"] == "true"); - + else + return parserError("Invalid layout type. Only 'horizontal' and 'vertical' layouts allowed."); + + if (node->values.contains("padding")) { int paddingL, paddingR, paddingT, paddingB; |