diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-01-02 20:57:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-01-02 20:57:18 +0000 |
| commit | e1bc083f91e066d9e5bb098e96b02d13713e8771 (patch) | |
| tree | 2e62f47136704fd869d6e7852080d45491192560 | |
| parent | 451a34f6ca95767f63d9d98b2fea02ccd569f7b0 (diff) | |
fix for global status calculation
git-svn-id: http://svn.miranda-ng.org/main/trunk@11728 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Clist_modern/src/modern_clisttray.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index e368ced8df..77230f364a 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -75,7 +75,7 @@ int GetStatusVal(int status) case ID_STATUS_OUTTOLUNCH: return 410;
}
- if (status < ID_STATUS_OFFLINE && status > 0)
+ if (status > 0 && status < ID_STATUS_OFFLINE)
return 600; // 'connecting' status has the top priority
return 0;
}
@@ -89,6 +89,8 @@ int GetStatusOrder(int currentStatus, int newStatus) INT_PTR CListTray_GetGlobalStatus(WPARAM, LPARAM)
{
+ g_szConnectingProto = NULL;
+
int curstatus = 0;
int connectingCount = 0;
for (int i = 0; i < pcli->hClcProtoCount; i++) {
@@ -101,7 +103,7 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM, LPARAM) if (connectingCount == 1)
g_szConnectingProto = p.szProto;
}
- curstatus = GetStatusOrder(curstatus, p.dwStatus);
+ else curstatus = GetStatusOrder(curstatus, p.dwStatus);
}
if (connectingCount == 0)
|