Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / CGUIContextMenu.cpp

diff --git a/source/Irrlicht/CGUIContextMenu.cpp b/source/Irrlicht/CGUIContextMenu.cpp
index 3a6484be5a80417f22b574e08cc95b505164a78a..d38ceeda75f474c11f4776974882c015955bd548 100644 (file)
--- a/source/Irrlicht/CGUIContextMenu.cpp
+++ b/source/Irrlicht/CGUIContextMenu.cpp
@@ -136,10 +136,10 @@ void CGUIContextMenu::setSubMenu(u32 index, CGUIContextMenu* menu)
                Items[index].SubMenu->drop();\r
 \r
        Items[index].SubMenu = menu;\r
-       menu->setVisible(false);\r
 \r
-       if (Items[index].SubMenu)\r
+       if (menu)\r
        {\r
+               menu->setVisible(false);\r
                menu->AllowFocus = false;\r
                if ( Environment->getFocus() == menu )\r
                {\r