explorer: Avoid crash on empty Start Menu folders.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

explorer: Avoid crash on empty Start Menu folders.
1b025eb0 · Alexandre Julliard · 03b06fb7 · 1b025eb0
Commit 1b025eb0 authored Jun 10, 2016 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

startmenu.c programs/explorer/startmenu.c +2 -2

No files found.
--- a/programs/explorer/startmenu.c
+++ b/programs/explorer/startmenu.c
@@ -464,8 +464,8 @@ void do_startmenu(HWND hwnd)
    if (!public_startmenu.folder)
        pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder);

-    if (!shell_folder_is_empty(user_startmenu.folder) ||
-        !shell_folder_is_empty(public_startmenu.folder))
+    if ((user_startmenu.folder && !shell_folder_is_empty(user_startmenu.folder)) ||
+        (public_startmenu.folder && !shell_folder_is_empty(public_startmenu.folder)))
    {
        fill_menu(&user_startmenu);