summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/button.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/gui/button.cpp b/gui/button.cpp
index 3f9c2df1f..be52c277e 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -58,15 +58,19 @@ GUIButton::GUIButton(xml_node<>* node)
if (!node) return;
- // Three of the four can be loaded directly from the node
- mButtonImg = new GUIImage(node);
+ // These can be loaded directly from the node
mButtonLabel = new GUIText(node);
mAction = new GUIAction(node);
- if (mButtonImg->Render() < 0)
+ child = node->first_node("image");
+ if (child)
{
- delete mButtonImg;
- mButtonImg = NULL;
+ mButtonImg = new GUIImage(node);
+ if (mButtonImg->Render() < 0)
+ {
+ delete mButtonImg;
+ mButtonImg = NULL;
+ }
}
if (mButtonLabel->Render() < 0)
{