When having submenu open in one window and activating its root menu in

another window, submenu didn't close and root menu's activate state
wasn't reset. Fixed.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1351 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-07-21 02:32:58 +00:00
parent 2f1b14fb21
commit 622479f8b4

View File

@ -512,9 +512,9 @@ static void fghActivateMenu( SFG_Window* window, int button )
SFG_Menu* menu = window->Menu[ button ];
SFG_Window* current_window = fgStructure.CurrentWindow;
/* If the menu is already active in another window, deactivate it there */
/* If the menu is already active in another window, deactivate it (and any submenu's) there */
if ( menu->ParentWindow )
menu->ParentWindow->ActiveMenu = NULL ;
fgDeactivateMenu(menu->ParentWindow);
/* Mark the menu as active, so that it gets displayed: */
window->ActiveMenu = menu;