From 6ed0f28f9288a76e479b916f2e579b1a61ac47fd Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 18 Jan 2024 14:20:19 +0300
Subject: Srmm_IsCustomLogUsed should take the 'forGroupchats' parameter into
 consideration

---
 plugins/Scriver/src/chat_options.cpp | 2 +-
 plugins/Scriver/src/msgoptions.cpp   | 2 +-
 plugins/TabSRMM/src/chat_options.cpp | 2 +-
 plugins/TabSRMM/src/msgoptions.cpp   | 2 +-
 plugins/TabSRMM/src/userprefs.cpp    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index 2c1a041325..8785129a98 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -363,7 +363,7 @@ void ChatOptInitialize(WPARAM wParam)
 	odp.szTab.a = LPGEN("General");
 	g_plugin.addOptions(wParam, &odp);
 
-	if (!Chat::bEnableCustomLogs) {
+	if (!Srmm_IsCustomLogUsed(true)) {
 		odp.pDialog = new CLogOptsDlg();
 		odp.szTab.a = LPGEN("Log formatting");
 		g_plugin.addOptions(wParam, &odp);
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 9e60d96540..2ff219b29b 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -805,7 +805,7 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	odp.szTab.a = LPGEN("Layout");
 	g_plugin.addOptions(wParam, &odp);
 
-	odp.pDialog = new CLogOptionsDlg(Srmm_IsCustomLogUsed() ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
+	odp.pDialog = new CLogOptionsDlg(Srmm_IsCustomLogUsed(false) ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
 	odp.szTab.a = LPGEN("Event log");
 	g_plugin.addOptions(wParam, &odp);
 
diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index 3f35dcfcf3..26ef4e6dad 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -895,7 +895,7 @@ void Chat_Options(WPARAM wParam)
 	odp.pDialog = new CChatSettingsDlg();
 	g_plugin.addOptions(wParam, &odp);
 
-	if (!Chat::bEnableCustomLogs) {
+	if (!Srmm_IsCustomLogUsed(true)) {
 		odp.szTab.a = LPGEN("Log formatting");
 		odp.pDialog = new CChatLogOptionDlg();
 		g_plugin.addOptions(wParam, &odp);
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 29d2285231..cd9af60eec 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1489,7 +1489,7 @@ int OptInitialise(WPARAM wParam, LPARAM lParam)
 	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("Message log");
-	odp.pDialog = new COptLogDlg(Srmm_IsCustomLogUsed() ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
+	odp.pDialog = new COptLogDlg(Srmm_IsCustomLogUsed(false) ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
 	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("Advanced tweaks");
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index f8f8705b9b..12f7e7b275 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -327,7 +327,7 @@ public:
 		SetCaption(szBuffer);
 
 		m_tab.AddPage(TranslateT("General"), nullptr, new CUserPrefsOptDlg(m_hContact));
-		if (!Srmm_IsCustomLogUsed())
+		if (!Srmm_IsCustomLogUsed(Contact::IsGroupChat(m_hContact)))
 			m_tab.AddPage(TranslateT("Message Log"), nullptr, new CUserPrefsLogDlg(m_hContact));
 		return true;
 	}
-- 
cgit v1.2.3