diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-12 23:04:27 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-12 23:04:27 +0300 |
| commit | 596456886db5df48599f62210500e0bbfa9d7da7 (patch) | |
| tree | 58c555add5372d37356b6397cde43c3d2cbac399 /src | |
| parent | b9c2a6953f0fa75a1c4de6079e9c97b3a60be7e5 (diff) | |
- fixes #742 (closing groupchat tab crashes Miranda);
- the bForce parameter of CSrmmBaseDialog::CloseTab considered useless
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/stdafx.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/chat_manager.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index dda13a4b78..589bff4510 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -1201,7 +1201,7 @@ void CChatRoomDlg::SaveWindowPosition(bool bUpdateSession) ///////////////////////////////////////////////////////////////////////////////////////// -void CChatRoomDlg::CloseTab(bool) +void CChatRoomDlg::CloseTab() { if (g_Settings.bTabsEnable) SendMessage(GetParent(m_hwndParent), GC_REMOVETAB, 0, (LPARAM)this); diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index d9959618aa..1f70555663 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -241,7 +241,7 @@ public: virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
virtual int Resizer(UTILRESIZECONTROL *urc) override;
- virtual void CloseTab(bool bForced = false) override;
+ virtual void CloseTab() override;
virtual void RedrawLog() override;
virtual void StreamInEvents(LOGINFO* lin, bool bRedraw) override;
virtual void ScrollToBottom() override;
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp index 72863f26d7..7e87b2a78b 100644 --- a/src/mir_app/src/chat_manager.cpp +++ b/src/mir_app/src/chat_manager.cpp @@ -73,7 +73,7 @@ static void SM_FreeSession(SESSION_INFO *si, bool bRemoveContact = false) db_set_w(si->hContact, si->pszModule, "ApparentMode", 0);
if (si->pDlg)
- si->pDlg->CloseTab(true);
+ si->pDlg->CloseTab();
DoEventHook(si, GC_SESSION_TERMINATE, nullptr, nullptr, (INT_PTR)si->pItemData);
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 4c35385bb0..b542fe6fed 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -412,7 +412,7 @@ Srmm_LogStreamCallback @412 Srmm_MessageStreamCallback @413
?DoEventHook@CSrmmBaseDialog@@IAEXHPBUUSERINFO@@PB_WH@Z @414 NONAME
?ClearLog@CSrmmBaseDialog@@QAEXXZ @415 NONAME
-?CloseTab@CSrmmBaseDialog@@UAEX_N@Z @416 NONAME
+?CloseTab@CSrmmBaseDialog@@UAEXXZ @416 NONAME
?UpdateStatusBar@CSrmmBaseDialog@@UAEXXZ @417 NONAME
Chat_UpdateOptions @418 NONAME
?RedrawLog@CSrmmBaseDialog@@UAEXXZ @419 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index b9521316af..f23d42cb20 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -412,7 +412,7 @@ Srmm_LogStreamCallback @412 Srmm_MessageStreamCallback @413
?DoEventHook@CSrmmBaseDialog@@IEAAXHPEBUUSERINFO@@PEB_W_J@Z @414 NONAME
?ClearLog@CSrmmBaseDialog@@QEAAXXZ @415 NONAME
-?CloseTab@CSrmmBaseDialog@@UEAAX_N@Z @416 NONAME
+?CloseTab@CSrmmBaseDialog@@UEAAXXZ @416 NONAME
?UpdateStatusBar@CSrmmBaseDialog@@UEAAXXZ @417 NONAME
Chat_UpdateOptions @418 NONAME
?RedrawLog@CSrmmBaseDialog@@UEAAXXZ @419 NONAME
|