From e08143e37cff1be034540d89028b9dba6f0cef70 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 12 Jul 2024 16:25:57 +0300 Subject: =?UTF-8?q?fixes=20#4530=20(Weaher:=20=D0=BD=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=83=D0=BF=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B0=20"=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C"=20=D0=B2=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/stduserinfo/src/userinfo.cpp | 2 +- src/mir_app/src/proto_internal.cpp | 2 +- src/mir_app/src/protocols.cpp | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index fc3d37bab5..1a6d7a150f 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -317,7 +317,7 @@ public: CheckOnline(); if (!CallContactService(m_hContact, PS_GETINFO, SGIF_ONOPEN)) { btnUpdate.Disable(); - SetTimer(m_hwnd, 1, 100, nullptr); + updateTimer.Start(100); } else ShowWindow(GetDlgItem(m_hwnd, IDC_UPDATING), SW_HIDE); diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp index dd1225a5d2..d10b3262c2 100644 --- a/src/mir_app/src/proto_internal.cpp +++ b/src/mir_app/src/proto_internal.cpp @@ -217,7 +217,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE int GetStatus() override { - return (int)ProtoCallService(m_szModuleName, PS_SETSTATUS, 0, 0); + return (int)ProtoCallService(m_szModuleName, PS_GETSTATUS, 0, 0); } int SetStatus(int iNewStatus) override diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp index 568ee41e5d..9acb77dada 100644 --- a/src/mir_app/src/protocols.cpp +++ b/src/mir_app/src/protocols.cpp @@ -295,8 +295,13 @@ MIR_APP_DLL(int) Proto_GetStatus(const char *accName) if (accName == nullptr) return ID_STATUS_OFFLINE; - PROTOACCOUNT *pa = g_arAccounts.find((PROTOACCOUNT*)&accName); - return (pa) ? pa->iRealStatus : ID_STATUS_OFFLINE; + if (auto *pa = g_arAccounts.find((PROTOACCOUNT *)&accName)) { + if (pa->bOldProto) + return ProtoCallService(pa->szModuleName, PS_GETSTATUS, 0, 0); + return pa->iRealStatus; + } + + return ID_STATUS_OFFLINE; } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3