mshtml: Call Exec in show_context_menu only if user selected menu item.

c6684369 · Jacek Caban · Alexandre Julliard · 8bafc2b6 · c6684369
Commit c6684369 authored Sep 09, 2007 by Jacek Caban Committed by Alexandre Julliard Sep 10, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

olecmd.c dlls/mshtml/olecmd.c +2 -1

No files found.
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -873,7 +873,8 @@ void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt)
            ppt->x, ppt->y, 0, This->hwnd, NULL);
    DestroyMenu(menu_res);

-    IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL);
+    if(cmdid)
+        IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL);
 }

 void HTMLDocument_OleCmd_Init(HTMLDocument *This)