diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-02-12 18:08:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-02-12 18:08:33 +0000 |
| commit | 36fd7d44957934f4fe6ddc1bb9597ae42519ad9d (patch) | |
| tree | f1254ab95742d50baa4c026dbfd529d26dc7c60e /plugins/Clist_nicer/src/clui.cpp | |
| parent | 64d6ba3286ecbf7f833e7aea52cd55487c95f9ef (diff) | |
various PS_GETCUSTOMSTATUSICON-related issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@3577 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/clui.cpp')
| -rw-r--r-- | plugins/Clist_nicer/src/clui.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 7a5ff0a196..d9639080cf 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1757,7 +1757,8 @@ buttons_done: char szBuffer[128];
mir_snprintf(szBuffer, 128, "%s_conn", pd->RealName);
hIcon = Skin_GetIcon(szBuffer);
- } else if (cfg::dat.bShowXStatusOnSbar && status > ID_STATUS_OFFLINE) {
+ }
+ else if (cfg::dat.bShowXStatusOnSbar && status > ID_STATUS_OFFLINE) {
CUSTOM_STATUS cst = {0};
char szServiceName[128];
int xStatus;
@@ -1766,12 +1767,12 @@ buttons_done: cst.cbSize = sizeof(CUSTOM_STATUS);
cst.flags = CSSF_MASK_STATUS;
cst.status = &xStatus;
- if (ServiceExists(szServiceName) && !CallService(szServiceName, 0, (LPARAM)&cst) && xStatus > 0) {
+ if (ServiceExists(szServiceName) && !CallService(szServiceName, 0, (LPARAM)&cst) && xStatus > 0)
hIcon = (HICON)CallProtoService(pd->RealName, PS_GETCUSTOMSTATUSICON, 0, LR_SHARED); // get OWN xStatus icon (if set)
- } else
+ else
hIcon = LoadSkinnedProtoIcon(szProto, status);
- } else
- hIcon = LoadSkinnedProtoIcon(szProto, status);
+ }
+ else hIcon = LoadSkinnedProtoIcon(szProto, status);
if ( !(showOpts & 6) && cfg::dat.bEqualSections)
x = (dis->rcItem.left + dis->rcItem.right - 16) >> 1;
|