Committed two lines from John to help fix the menus a bit.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@222 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c
index 1194908..a0b544c 100644 (file)
--- a/src/freeglut_menu.c
+++ b/src/freeglut_menu.c
@@ -638,7 +638,7 @@ void fgDeactivateMenu( SFG_Window *window )
       /*
        * Is that an active submenu by any case?
        */
-      if ( ( menuEntry->SubMenu != NULL ) && menuEntry->SubMenu->IsActive )
+      if ( menuEntry->SubMenu != NULL )
         fgDeactivateSubMenu ( menuEntry ) ;
     }
 
@@ -673,7 +673,7 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry )
       /*
        * Is that an active submenu by any case?
        */
-      if ( ( subMenuIter->SubMenu != NULL ) && subMenuIter->SubMenu->IsActive )
+      if ( subMenuIter->SubMenu != NULL )
         fgDeactivateSubMenu ( subMenuIter ) ;
     }