Fix crash that occurs when closing application window while invetory is displayed.

diff --git a/win/win32/mhmenu.c b/win/win32/mhmenu.c
index 6c07b5081336e333964b7f6390e9577cc6dbc681..28a37a25698f5ac677454e929910ffb06099eba5 100644 (file)
--- a/win/win32/mhmenu.c
+++ b/win/win32/mhmenu.c
@@ -884,6 +884,11 @@ GetMenuControl(HWND hWnd)
 
     data = (PNHMenuWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
 
+       /* We may continue getting window messages after a window's WM_DESTROY is
+          called.  We need to handle the case that USERDATA has been freed. */
+       if (data == NULL)
+               return NULL;
+
     if (data->type == MENU_TYPE_TEXT) {
         return GetDlgItem(hWnd, IDC_MENU_TEXT);
     } else {