We need to set the new text even if the old text string was NULL.

30dc4291 · Huw Davies · Alexandre Julliard · cf8a25f0 · 30dc4291
Commit 30dc4291 authored Mar 11, 2004 by Huw Davies Committed by Alexandre Julliard Mar 11, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

menu.c controls/menu.c +4 -3

No files found.
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -4237,9 +4237,10 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
    }

    if (lpmii->fMask & MIIM_STRING ) {
-	/* free the string when used */
-	if (IS_STRING_ITEM(menu->fType) && menu->text) {
-	    HeapFree(GetProcessHeap(), 0, menu->text);
+	if (IS_STRING_ITEM(menu->fType)) {
+            /* free the string when used */
+            if(menu->text)
+                HeapFree(GetProcessHeap(), 0, menu->text);
            set_menu_item_text( menu, lpmii->dwTypeData, unicode );
 	}
    }