diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-18 22:03:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-18 22:03:24 +0000 |
| commit | be538312417a60f4fbdfcc81b93744af72aa9df3 (patch) | |
| tree | 6252b7ed4262dfb2fc0673b5ce9641dd659f5eb9 /plugins/FingerprintNG | |
| parent | 044b929e389a80fee57ba216ccb6ad5e73fcf03d (diff) | |
various icon issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@5031 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FingerprintNG')
| -rw-r--r-- | plugins/FingerprintNG/src/fingerprint.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 6d17d5f99d..30f6655b4c 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -149,7 +149,7 @@ static void SetSrmmIcon(HANDLE hContact, LPTSTR ptszMirver) sid.tszTooltip = ptszMirver;
if ( lstrlen(ptszMirver))
- sid.hIcon = sid.hIconDisabled = (HICON)ServiceGetClientIconW((WPARAM)ptszMirver, TRUE);
+ sid.hIcon = (HICON)ServiceGetClientIconW((WPARAM)ptszMirver, TRUE);
else
sid.flags |= MBF_HIDDEN;
@@ -486,10 +486,8 @@ HICON __fastcall CreateIconFromIndexes(short base, short overlay, short overlay2 hIcon = icMain;
- if (overlayMask) {
- hIcon = CreateJoinedIcon(hIcon, icOverlay);
- hTmp = hIcon;
- }
+ if (overlayMask)
+ hTmp = hIcon = CreateJoinedIcon(hIcon, icOverlay);
if (overlay2Mask) {
hIcon = CreateJoinedIcon(hIcon, icOverlay2);
@@ -500,6 +498,7 @@ HICON __fastcall CreateIconFromIndexes(short base, short overlay, short overlay2 if (overlay3Mask) {
hIcon = CreateJoinedIcon(hIcon, icOverlay3);
if (hTmp) DestroyIcon(hTmp);
+ hTmp = hIcon;
}
if (overlay4Mask) {
|