From: Diederick Niehorster <dcnieho@gmail.com>
Date: Sun, 22 Jul 2012 10:54:39 +0000 (+0000)
Subject: now checking for NULL window in fgDeactivateMenu (thanks for Ioannis to
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=4abad463b8e04c45c4e5ce8a718ee608fa7033f9;p=freeglut

now checking for NULL window in fgDeactivateMenu (thanks for Ioannis to
point out this occurs)
now dealing with the aftermath of the corner case bugs of different
menus in main and child windows both being open at the same time (which
is a bug in itself, but can't figure out a fix). No more crash at least!



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

diff --git a/src/fg_menu.c b/src/fg_menu.c
index 0c6c64e..3ad2cb1 100644
--- a/src/fg_menu.c
+++ b/src/fg_menu.c
@@ -620,11 +620,32 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
             /*
              * Outside the menu, deactivate if it's a downclick
              *
-             * XXX This isn't enough.  A downclick outside of
-             * XXX the interior of our freeglut windows should also
-             * XXX deactivate the menu.  This is more complicated.
+             * A downclick outside of the interior of our freeglut windows
+             * is dealt with in the WM_KILLFOCUS handler of fgPlatformWindowProc
              */
-            fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+        {
+            if (window->ActiveMenu->ParentWindow)
+                fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+            else
+            {
+                /* 
+                 * Its a rare occasion that a window has an ActiveMenu but
+                 * that menus does not have a parent window. It happens
+                 * however in the corner case bug when one opens a menu in
+                 * a main window, then opens a different menu in this main
+                 * window's child (you now have two menus open
+                 * simultaneously, thats the bug) and then click somewhere
+                 * else that causes both menus to close. One of them is
+                 * then not properly cleaned up. This finishes the cleaning
+                 * and minimizes the impact on the user, he only needs one
+                 * extra mouse click.
+                 */
+                fghSetMenuParentWindow ( NULL, window->ActiveMenu );
+                window->ActiveMenu->IsActive = GL_FALSE;
+                window->ActiveMenu->ActiveEntry = NULL;
+                window->ActiveMenu = NULL;
+            }
+        }
 
         /*
          * XXX Why does an active menu require a redisplay at
@@ -659,11 +680,12 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
 void fgDeactivateMenu( SFG_Window *window )
 {
     SFG_Window *parent_window = NULL;
-
-    /* Check if there is an active menu attached to this window... */
-    SFG_Menu* menu = window->ActiveMenu;
+    SFG_Menu* menu;
     SFG_MenuEntry *menuEntry;
 
+    /* Check if there is an active menu attached to this window... */
+    freeglut_return_if_fail( window );
+    menu = window->ActiveMenu;
     /* Did we find an active window? */
     freeglut_return_if_fail( menu );
 
diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index 25330e8..a7ca9d8 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -518,7 +518,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                 if (!hwnd || !wnd)
                     /* User switched to another application*/
                     fgDeactivateMenu(menu->ParentWindow);
-                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)
+                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)   /* Make sure we don't kill the menu when trying to enter a submenu */
                     /* User switched to another FreeGLUT window */
                     fgDeactivateMenu(menu->ParentWindow);
             }