From b5c485fb74398c55ac7af678c913e40b7aecf7ea Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 25 Jul 2013 12:57:56 +0000 Subject: [PATCH] [shell32] - Do not call OnDefaultCommand when there is no selected item in the shell view svn path=/trunk/; revision=59580 --- reactos/dll/win32/shell32/shlview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp index a9d5d95f4b5..aaad9e17013 100644 --- a/reactos/dll/win32/shell32/shlview.cpp +++ b/reactos/dll/win32/shell32/shlview.cpp @@ -1102,6 +1102,10 @@ HRESULT CDefView::OpenSelectedItems() UINT uCommand; HRESULT hResult; + cidl = ListView_GetSelectedCount(hWndList); + if (cidl == 0) + return S_OK; + hResult = OnDefaultCommand(); if (hResult == S_OK) return hResult; @@ -1175,7 +1179,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (!hMenu) return E_FAIL; - GetSelections(); + cidl = ListView_GetSelectedCount(hWndList); hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); if (FAILED( hResult))