- fixes #742 (closing groupchat tab crashes Miranda);

- the bForce parameter of CSrmmBaseDialog::CloseTab considered useless

12 files changed, 12 insertions, 12 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 3fdf5b984b..b2912ac609 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -414,7 +414,7 @@ public:
 	void ShowColorChooser(int iCtrlId);

 

 	virtual void AddLog();

-	virtual void CloseTab(bool = false) {}

+	virtual void CloseTab() {}

 	virtual void RedrawLog() {}

 	virtual void ScrollToBottom() {}

 	virtual void ShowFilterMenu() {}

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 5ea3545b8b..ae9a6a7c67 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index afdf0ab9ac..ebbd20fc6d 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 98908c14ee..921247b76a 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -366,7 +366,7 @@ CScriverWindow::CScriverWindow(int iDialog, SESSION_INFO *si)
 	m_autoClose = CLOSE_ON_CANCEL;

 }

 

-void CScriverWindow::CloseTab(bool)

+void CScriverWindow::CloseTab()

 {

 	Close();

 }

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index df69df5f9a..f73be3d2ba 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -91,7 +91,7 @@ protected:
 	CScriverWindow(int iDialog, SESSION_INFO* = nullptr);

 

 public:

-	virtual void CloseTab(bool bForced = false) override;

+	virtual void CloseTab() override;

 

 	ParentWindowData *m_pParent;

 	int m_minLogBoxHeight, m_minEditBoxHeight;

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index 9eade66075..b78ef9461e 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -1948,7 +1948,7 @@ void CChatRoomDlg::AddLog()
 	CSrmmBaseDialog::AddLog();
 }
 
-void CChatRoomDlg::CloseTab(bool bForced)
+void CChatRoomDlg::CloseTab()
 {
 	int iTabs = TabCtrl_GetItemCount(m_hwndParent);
 	if (iTabs == 1 && CMimAPI::m_shutDown == 0) {
@@ -1963,7 +1963,7 @@ void CChatRoomDlg::CloseTab(bool bForced)
 	// the previously open tab.
 	// normally, this tab has the same index after the deletion of the formerly active tab
 	// unless, of course, we closed the last (rightmost) tab.
-	if (!m_pContainer->bDontSmartClose && iTabs > 1 && !bForced) {
+	if (!m_pContainer->bDontSmartClose && iTabs > 1) {
 		if (i == iTabs - 1)
 			i--;
 		else
@@ -2921,7 +2921,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			}
 			_dlgReturn(m_hwnd, TRUE);
 		}
-		CloseTab(true);
+		CloseTab();
 		return 0;
 
 	case DM_SAVESIZE:
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index a88344eb34..a37b4d55a8 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -499,7 +499,7 @@ public:
 	virtual int Resizer(UTILRESIZECONTROL *urc) override;

 	

 	virtual void AddLog() override;

-	virtual void CloseTab(bool bForced = false) override;

+	virtual void CloseTab() override;

 	virtual void RedrawLog() override;

 	virtual void ScrollToBottom() override;

 	virtual void ShowFilterMenu() override;

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