- Fix breakage due to WM_NCPAINT call. Duplicate check for draw caption bar Justin Case.

svn path=/trunk/; revision=72181
This commit is contained in:
James Tabor 2016-08-10 03:02:57 +00:00
parent 824b41c0b2
commit 831a53f80f

View file

@ -944,7 +944,7 @@ VOID UserDrawCaptionBar(
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 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags)
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))
{