[jimtabor] 72181: [NtUser] - Fix breakage due to WM_NCPAINT call. Duplicate check for draw caption bar Justin Case.

Author: jimtabor
Date: Wed Aug 10 03:02:57 2016
New Revision: 72181

URL: http://svn.reactos.org/svn/reactos?rev=72181&view=rev
Log:
[NtUser]
- Fix breakage due to WM_NCPAINT call. Duplicate check for draw caption bar Justin Case.

Modified:
    trunk/reactos/win32ss/user/ntuser/nonclient.c

Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/nonclie...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/nonclient.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/nonclient.c	[iso-8859-1] Wed Aug 10 03:02:57 2016
@@ -944,7 +944,7 @@
    if (!(Style & WS_MINIMIZE))
    {
       /* Draw menu bar */
-      if (pWnd->state & WNDS_HASMENU)
+      if (pWnd->state & WNDS_HASMENU && pWnd->IDMenu) // Should be pWnd->spmenu
       {
           PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)); // FIXME!
           TempRect = CurrentRect;
@@ -1113,7 +1113,7 @@
    if (!(Style & WS_MINIMIZE))
    {
      /* Draw menu bar */
-     if (pWnd->state & WNDS_HASMENU)
+     if (pWnd->state & WNDS_HASMENU && pWnd->IDMenu) // Should be pWnd->spmenu
      {
          if (!(Flags & DC_NOSENDMSG))
          {