From 9451639c7300d806afe81ef5dc680f8f4472f6f8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 17 Jul 2019 19:10:59 +0300 Subject: ICQ-WIM: no need to launch this dialog twice --- protocols/ICQ-WIM/src/options.cpp | 10 ++++++++-- protocols/ICQ-WIM/src/proto.h | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp index 55428358d7..957c7002d6 100644 --- a/protocols/ICQ-WIM/src/options.cpp +++ b/protocols/ICQ-WIM/src/options.cpp @@ -35,7 +35,7 @@ public: bool OnInitDialog() override { - chkSave.SetState(m_proto->m_bRememberPwd); + chkSave.SetState(m_proto->getBool("RememberPass")); Window_SetIcon_IcoLib(m_hwnd, m_proto->m_hProtoIcon); return true; } @@ -64,7 +64,13 @@ bool CIcqProto::RetrievePassword() return true; } - return CIcqEnterLoginDlg(this).DoModal() == IDOK; + if (m_bDlgActive) + return false; + + m_bDlgActive = true; + bool bRet = CIcqEnterLoginDlg(this).DoModal() == IDOK; + m_bDlgActive = false; + return bRet; } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index 15091e3fd3..6056382e89 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -250,7 +250,8 @@ class CIcqProto : public PROTO CMStringA m_szMailBox; bool m_bIgnoreListEmpty = true; - bool m_bRememberPwd = false; // store password in a database + bool m_bRememberPwd; // store password in a database + bool m_bDlgActive; //////////////////////////////////////////////////////////////////////////////////////// // group chats -- cgit v1.2.3