diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:49:54 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:49:54 +0000 |
| commit | 878d72910cccf4f84c7cb45bb4c11134920f3166 (patch) | |
| tree | 251fba89632c389309ff9b2451850aa949efb8d0 /src/core/stdfile | |
| parent | 871410044ecbac0d2dd67a7c98f8bcd2df9410eb (diff) | |
- naming conflict;
- warning fixes;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14988 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdfile')
| -rw-r--r-- | src/core/stdfile/src/fileexistsdlg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/stdfile/src/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp index 32a7ba5b8a..ea087b0f24 100644 --- a/src/core/stdfile/src/fileexistsdlg.cpp +++ b/src/core/stdfile/src/fileexistsdlg.cpp @@ -87,12 +87,12 @@ static void DoAnnoyingShellCommand(HWND hwnd, const TCHAR *szFilename, int cmd, case C_CONTEXTMENU:
HMENU hMenu = CreatePopupMenu();
if (SUCCEEDED(pContextMenu->QueryContextMenu(hMenu, 0, 1000, 65535, (GetKeyState(VK_SHIFT) & 0x8000 ? CMF_EXTENDEDVERBS : 0) | CMF_NORMAL))) {
- int cmd = TrackPopupMenu(hMenu, TPM_RETURNCMD, ptCursor->x, ptCursor->y, 0, hwnd, NULL);
- if (cmd) {
+ int ret = TrackPopupMenu(hMenu, TPM_RETURNCMD, ptCursor->x, ptCursor->y, 0, hwnd, NULL);
+ if (ret) {
CMINVOKECOMMANDINFO ici = { 0 };
ici.cbSize = sizeof(ici);
ici.hwnd = hwnd;
- ici.lpVerb = MAKEINTRESOURCEA(cmd - 1000);
+ ici.lpVerb = MAKEINTRESOURCEA(ret - 1000);
ici.nShow = SW_SHOW;
pContextMenu->InvokeCommand(&ici);
}
|