From 210acddc8bc8d48c7a3d71c09db0eed3f5a9c2b0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Jun 2020 22:02:52 +0300 Subject: =?UTF-8?q?fixes=20#2438=20(Jabber:=20=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B0=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=20=D1=81=D0=B5=D0=B1=D1=8F=20=D0=B2=D0=B5=D0=B4=D1=83=D1=82)?= =?UTF-8?q?=20+=20some=20another=20DoModal()=20calls=20cleaning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/src/options.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'protocols/ICQ-WIM') diff --git a/protocols/ICQ-WIM/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp index 649f70efef..bf9426e790 100644 --- a/protocols/ICQ-WIM/src/options.cpp +++ b/protocols/ICQ-WIM/src/options.cpp @@ -35,6 +35,7 @@ public: bool OnInitDialog() override { + m_proto->m_bDlgActive = true; chkSave.SetState(m_proto->getBool("RememberPass")); Window_SetIcon_IcoLib(m_hwnd, m_proto->m_hProtoIcon); return true; @@ -47,6 +48,11 @@ public: EndModal(true); return true; } + + void OnDestroy() override + { + m_proto->m_bDlgActive = false; + } }; bool CIcqProto::RetrievePassword() @@ -67,10 +73,7 @@ bool CIcqProto::RetrievePassword() if (m_bDlgActive) return false; - m_bDlgActive = true; - bool bRet = CIcqEnterLoginDlg(this).DoModal() == IDOK; - m_bDlgActive = false; - return bRet; + return CIcqEnterLoginDlg(this).DoModal(); } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3