From 7585b2a652446ce72a1903c5fa91cd983ce37782 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Mar 2017 21:13:14 +0300 Subject: attempt to fix a problem with closing chats --- plugins/TabSRMM/src/chat/window.cpp | 6 +----- plugins/TabSRMM/src/msgdialog.cpp | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 6864cfb9d9..81c747b439 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -3027,10 +3027,6 @@ LABEL_SHOWWINDOW: break; case WM_CLOSE: - if (m_bExiting) - return 0; - m_bExiting = true; - if (wParam == 0 && lParam == 0) { if (PluginConfig.m_EscapeCloses == 1) { SendMessage(m_pContainer->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); @@ -3120,7 +3116,7 @@ LABEL_SHOWWINDOW: SendMessage(m_pContainer->hwnd, WM_CLOSE, 0, 1); else { PostMessage(m_pContainer->hwnd, WM_SIZE, 0, 0); - Close(); + DestroyWindow(m_hwnd); } } return 0; diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 08c507c606..7739c32e65 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -3131,10 +3131,6 @@ quote_from_last: return 0; case WM_CLOSE: - if (m_bExiting) - return 0; - m_bExiting = true; - // esc handles error controls if we are in error state (error controls visible) if (wParam == 0 && lParam == 0 && m_dwFlags & MWF_ERRORSTATE) { SendMessage(m_hwnd, DM_ERRORDECIDED, MSGERROR_CANCEL, 0); -- cgit v1.2.3