From 7937e21de4d288fc45d3b1a4b30ccb801df70b3d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 3 Jan 2020 20:09:05 +0300 Subject: OnLoggedOut to be called in the ServerThread, as the only safe place to do that --- protocols/ICQ-WIM/src/http.cpp | 2 ++ protocols/ICQ-WIM/src/proto.cpp | 2 -- protocols/ICQ-WIM/src/proto.h | 2 -- protocols/ICQ-WIM/src/server.cpp | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/http.cpp b/protocols/ICQ-WIM/src/http.cpp index 4826a411c6..bfa22866b3 100644 --- a/protocols/ICQ-WIM/src/http.cpp +++ b/protocols/ICQ-WIM/src/http.cpp @@ -75,6 +75,8 @@ void __cdecl CIcqProto::ServerThread(void*) } } + OnLoggedOut(); + m_hWorkerThread = nullptr; for (auto &it : m_ConnPool) { if (it.s) diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index cfc28506f9..e50442fd8b 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -130,8 +130,6 @@ void CIcqProto::OnModulesLoaded() void CIcqProto::OnShutdown() { - UI_SAFE_CLOSE(m_pdlgEditIgnore); - m_bTerminated = true; } diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index e4cc21cd08..040796bb87 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -297,8 +297,6 @@ class CIcqProto : public PROTO OBJLIST m_arGroups; - CIcqDlgBase *m_pdlgEditIgnore; - int m_unreadEmails = -1; CMStringA m_szMailBox; diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 4bf8ab7385..b3bbcc460c 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -538,8 +538,6 @@ void CIcqProto::ShutdownSession() if (m_hWorkerThread) SetEvent(m_evRequestsQueue); - OnLoggedOut(); - for (auto &it : m_ConnPool) { if (it.s) { Netlib_Shutdown(it.s); -- cgit v1.2.3