user: Fix dereferencing a potential NULL pointer.
This commit is contained in:
parent
5f4b424553
commit
7a560493fe
|
@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
|
|||
else
|
||||
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
|
||||
|
||||
menu = MENU_GetMenu( hmenu );
|
||||
|
||||
if( (menu = MENU_GetMenu( hmenu )))
|
||||
{
|
||||
/* draw menu items */
|
||||
if (menu && menu->nItems)
|
||||
if( menu->nItems)
|
||||
{
|
||||
MENUITEM *item;
|
||||
UINT u;
|
||||
|
||||
for (u = menu->nItems, item = menu->items; u > 0; u--, item++)
|
||||
MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, item,
|
||||
menu->Height, FALSE, ODA_DRAWENTIRE );
|
||||
|
||||
item = menu->items;
|
||||
for( u = menu->nItems; u > 0; u--, item++)
|
||||
MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc,
|
||||
item, menu->Height, FALSE, ODA_DRAWENTIRE );
|
||||
}
|
||||
|
||||
/* draw scroll arrows */
|
||||
if (menu->bScrolling)
|
||||
MENU_DrawScrollArrows(menu, hdc);
|
||||
}
|
||||
} else
|
||||
{
|
||||
SelectObject( hdc, hPrevBrush );
|
||||
|
|
Loading…
Reference in New Issue