diff options
| author | George Hazan <ghazan@miranda.im> | 2020-06-10 22:02:52 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-06-10 22:02:52 +0300 |
| commit | 210acddc8bc8d48c7a3d71c09db0eed3f5a9c2b0 (patch) | |
| tree | 2a1041f133ed8884f7f979ea085482f245bd85fc /protocols/ICQ-WIM/src | |
| parent | a5f518e4cbfd3b47c62d2ef5b524ae1252af9e35 (diff) | |
fixes #2438 (Jabber: списки приватности странно себя ведут) + some another DoModal() calls cleaning
Diffstat (limited to 'protocols/ICQ-WIM/src')
| -rw-r--r-- | protocols/ICQ-WIM/src/options.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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(); } ///////////////////////////////////////////////////////////////////////////////////////// |