summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-16 20:33:13 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-16 20:33:13 +0000
commit769b537b5e1a99fc53aa7296fd2b21dc77a4071c (patch)
tree7df94b386078575e6186523e1a165e4b0ba7ad9f /src
parent2e15a3c2aae091fcbdd3234931a2777d050e43e1 (diff)
name conflicts solved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/menu_clist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index 3fd80a7f0b..cfbdd96d0c 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -1019,7 +1019,7 @@ static int MenuProtoAck(WPARAM, LPARAM lParam)
if (!mir_strcmp(accounts[i]->szModuleName, ack->szModule)) {
int iOldStatus = (int)ack->hProcess;
if ((iOldStatus >= ID_STATUS_OFFLINE || iOldStatus == 0) && iOldStatus < ID_STATUS_OFFLINE + _countof(statusModeList)) {
- int pos = statustopos((int)ack->hProcess);
+ int pos = statustopos(iOldStatus);
if (pos == -1)
pos = 0;
for (pos = 0; pos < _countof(statusModeList); pos++)