From e54bcebf0bf8763bd08a43b2deb4cca5f5c57bb2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 29 Mar 2012 22:26:32 +0200 Subject: [PATCH] Fixed issue #982: TortoiseGit messes up TortoiseSVN and TortoiseCVS menu icons on WinXP Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseShell/ContextMenu.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index c761eb45c..f52d41427 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -21,6 +21,7 @@ * Fixed issue #1105: Wrong status for missing files * Fixed some TortoiseMerge patch apply issues (includes issue #1117) * Fixed issue #718: When pulling it should be possible to directly open the modifications window for editing conflicts + * Fixed issue #982: TortoiseGit messes up TortoiseSVN and TortoiseCVS menu icons on WinXP = Release 1.7.7.0 = == Features== diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp index 4c4a3c5d5..6ef14fbe6 100644 --- a/src/TortoiseShell/ContextMenu.cpp +++ b/src/TortoiseShell/ContextMenu.cpp @@ -2059,7 +2059,7 @@ STDMETHODIMP CShellExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_MEASUREITEM: { MEASUREITEMSTRUCT* lpmis = (MEASUREITEMSTRUCT*)lParam; - if (lpmis==NULL||lpmis->CtlType!=ODT_MENU) + if (lpmis==NULL) break; lpmis->itemWidth = 16; lpmis->itemHeight = 16; -- 2.11.4.GIT