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

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@222 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-10-11 11:13:23 +00:00
parent 2dc7f60b59
commit 8cad52a9c1

View File

@ -638,7 +638,7 @@ void fgDeactivateMenu( SFG_Window *window )
/* /*
* Is that an active submenu by any case? * Is that an active submenu by any case?
*/ */
if ( ( menuEntry->SubMenu != NULL ) && menuEntry->SubMenu->IsActive ) if ( menuEntry->SubMenu != NULL )
fgDeactivateSubMenu ( menuEntry ) ; fgDeactivateSubMenu ( menuEntry ) ;
} }
@ -673,7 +673,7 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry )
/* /*
* Is that an active submenu by any case? * Is that an active submenu by any case?
*/ */
if ( ( subMenuIter->SubMenu != NULL ) && subMenuIter->SubMenu->IsActive ) if ( subMenuIter->SubMenu != NULL )
fgDeactivateSubMenu ( subMenuIter ) ; fgDeactivateSubMenu ( subMenuIter ) ;
} }