Changeset 3501 for trunk/src/user32/menu.cpp

Timestamp:

May 9, 2000, 8:56:59 PM (25 years ago)

Author:

sandervl

Message:

lots of changes/fixes

File:

• trunk/src/user32/menu.cpp (modified) (4 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.20 2000-03-24 19:20:33 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.21 2000-05-09 18:56:56 sandervl Exp $*/
 /*
  * Menu functions
@@ -1599 +1599 @@
             if (!pTopPopupWnd)
             {
+                DebugInt3();
                 return FALSE;
             }
@@ -1615 +1616 @@
                 if( !menu->hWnd )
                 {
+                    DebugInt3();
                     return FALSE;
                 }
@@ -2183 +2185 @@
    {
         Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(menu->hWnd);
-        if(win32wnd==NULL)
-                DebugInt3();
+        if(win32wnd==NULL) {
+            //SvL: This happens in Moraff's YourJongg 2.0, return here
+            //TODO: Check if this is supposed to happen at all...
+            return (HMENU)0;
+        }
 
         ht = win32wnd->HandleNCHitTest(pt);