diff options
author | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
commit | 3f1628f127d35aa14da97e50c2a94cfd61ad52dd (patch) | |
tree | e9f1d8a1282e3c5ee0139003f4aac0e932a99213 /plugins/StatusManager/src/KeepStatus/keepstatus.cpp | |
parent | 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (diff) |
merge from master to
fixes #1349 (Miranda crashes on coming back from auto away)
Diffstat (limited to 'plugins/StatusManager/src/KeepStatus/keepstatus.cpp')
-rw-r--r-- | plugins/StatusManager/src/KeepStatus/keepstatus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp index cd24606687..403f8e8be2 100644 --- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp +++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp @@ -198,7 +198,7 @@ static int SetCurrentStatus() } } ProcessPopup(KS_CONN_STATE_RETRY, (LPARAM)ps.getArray()); - return CallService(MS_CS_SETSTATUSEX, (WPARAM)&ps, 0); + return SetStatusEx(ps); } static int StatusChange(WPARAM wParam, LPARAM lParam) @@ -243,7 +243,7 @@ static int CSStatusChange(WPARAM wParam, LPARAM) return 0; } -static int CSStatusChangeEx(WPARAM wParam, LPARAM) +static int CSStatusChangeEx(WPARAM wParam, LPARAM pCount) { // the status was changed by commonstatus (new) if (wParam != 0) { @@ -251,7 +251,7 @@ static int CSStatusChangeEx(WPARAM wParam, LPARAM) if (protoSettings == nullptr) return -1; - for (int i = 0; i < protoList.getCount(); i++) { + for (int i = 0; i < pCount; i++) { auto psi = protoSettings[i]; if (psi->m_szName == nullptr) continue; |