From c66843693f4c99478897af9280d2639195a381a2 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 9 Sep 2007 20:11:32 +0200
Subject: [PATCH] mshtml: Call Exec in show_context_menu only if user selected
 menu item.

---
 dlls/mshtml/olecmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index c481e6afe34..88c456ac10d 100644
--- 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)