X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffg_menu.c;h=2460b1d2f19941b10d7ce52406d5c34ccb8ff220;hb=a4c20df8f80c36d45fae8fdaac2bed379a870955;hp=0e219b8bf21aaf2e1c95440eaac79bee362537f3;hpb=1b5ee849ba61b667aeba474a7e03406196478bee;p=freeglut diff --git a/src/fg_menu.c b/src/fg_menu.c index 0e219b8..2460b1d 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -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;