Index: src/chext/MenuExt.cpp
===================================================================
diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r250c9a4d3a066af0d40def01e15df5753748aefe
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 250c9a4d3a066af0d40def01e15df5753748aefe)
@@ -105,8 +105,11 @@
 	}
 }
 
-STDMETHODIMP CMenuExt::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT /*idCmdLast*/, UINT /*uFlags*/)
+STDMETHODIMP CMenuExt::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
 {
+	idCmdLast;
+	uFlags;
+
 	try
 	{
 		LOG_DEBUG(m_spLog) << L"Querying context menu";
@@ -122,6 +125,9 @@
 		if(!hWnd)
 			return S_OK;
 
+		if (m_tContextMenuHandler.HasCHItems(hMenu))
+			return S_OK;
+
 		// current commands count in menu
 		TCHAR szText[ _MAX_PATH ];
 		int iCount = ::GetMenuItemCount(hMenu);