Don't override the FGIMG style property if the image parameter is null

diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 320608642f8917f92c73339a988613ca1a7d1423..e6cd50d86bb578941509f59a4f4bc95c4d778b16 100644 (file)
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -1835,9 +1835,6 @@ void GUIFormSpecMenu::parseImageButton(parserData* data, const std::string &elem
                if (type == "image_button_exit")
                        spec.is_exit = true;
 
-               video::ITexture *texture = 0;
-               texture = m_tsrc->getTexture(image_name);
-
                GUIButtonImage *e = GUIButtonImage::addButton(Environment, rect, this, spec.fid, spec.flabel.c_str());
 
                if (spec.fname == data->focused_fieldname) {
@@ -1849,8 +1846,12 @@ void GUIFormSpecMenu::parseImageButton(parserData* data, const std::string &elem
 
                // We explicitly handle these arguments *after* the style properties in
                // order to override them if they are provided
-               e->setForegroundImage(guiScalingImageButton(
-                       Environment->getVideoDriver(), texture, geom.X, geom.Y));
+               if (!image_name.empty())
+               {
+                       video::ITexture *texture = m_tsrc->getTexture(image_name);
+                       e->setForegroundImage(guiScalingImageButton(
+                               Environment->getVideoDriver(), texture, geom.X, geom.Y));
+               }
                if (!pressed_image_name.empty()) {
                        video::ITexture *pressed_texture = m_tsrc->getTexture(pressed_image_name);
                        e->setPressedForegroundImage(guiScalingImageButton(