fixes #3691 (tabSRMM: перестала работать настройка "Фон журнала")

9 files changed, 14 insertions, 2 deletions

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 94f6fbd6d3..ab50d3ee6f 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -340,7 +340,7 @@ public:
 	virtual bool GetFirstEvent() = 0;

 	virtual bool IsActive() const = 0;

 	virtual void LoadSettings() = 0;

-	virtual void OnOptionsApplied() = 0;

+	virtual void OnOptionsApplied();

 	virtual void RemakeLog() = 0;

 	virtual void SetStatusText(const wchar_t *, HICON) {}

 	virtual void ShowFilterMenu() {}

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index f241c27403..b5d4a97c1e 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 7a29e46a3e..ed1f24f383 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index b51a30d967..026aedf664 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -296,6 +296,8 @@ void CMsgDialog::NotifyTyping(int mode)
 
 void CMsgDialog::OnOptionsApplied()
 {
+	CSuper::OnOptionsApplied();
+
 	GetAvatar();
 	UpdateTitle();
 	UpdateStatusBar();
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 618661c0ef..16f49c55ac 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -842,6 +842,8 @@ void CMsgDialog::DM_NotifyTyping(int mode)
 

 void CMsgDialog::OnOptionsApplied()

 {

+	CSuper::OnOptionsApplied();

+

 	m_szMicroLf[0] = 0;

 	if (!m_pContainer->m_theme.isPrivate) {

 		m_pContainer->LoadThemeDefaults();

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index a6e85f433b..d5a9b8b861 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1068,6 +1068,8 @@ void CMsgDialog::TabAutoComplete()
 

 void CMsgDialog::OnOptionsApplied()

 {

+	CSuper::OnOptionsApplied();

+

 	if (isChat()) {

 		HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);

 		SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 986b1c5182..8359cb841b 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -906,3 +906,4 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?SetMessageText@CSrmmBaseDialog@@QAEXPB_W_N@Z @1023 NONAME

 ?GetInput@CSrmmBaseDialog@@QBEPAUHWND__@@XZ @1024 NONAME

 ?Srmm_ApplyOptions@@YGXXZ @1025 NONAME

+?OnOptionsApplied@CSrmmBaseDialog@@UAEXXZ @1026 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 3d6eca5103..7cedefa3d5 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -906,3 +906,4 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?SetMessageText@CSrmmBaseDialog@@QEAAXPEB_W_N@Z @1023 NONAME

 ?GetInput@CSrmmBaseDialog@@QEBAPEAUHWND__@@XZ @1024 NONAME

 ?Srmm_ApplyOptions@@YAXXZ @1025 NONAME

+?OnOptionsApplied@CSrmmBaseDialog@@UEAAXXZ @1026 NONAME

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index c1009298a1..6176b753d1 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -571,7 +571,6 @@ INT_PTR CSrmmBaseDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 {

 	switch (msg) {

 	case DM_OPTIONSAPPLIED:

-		m_pLog->UpdateOptions();

 		OnOptionsApplied();

 		return 0;

 

@@ -735,6 +734,11 @@ void CSrmmBaseDialog::UpdateChatLog()
 	m_pLog->LogChatEvents(nullptr);

 }

 

+void CSrmmBaseDialog::OnOptionsApplied()

+{

+	m_pLog->UpdateOptions();

+}

+

 void CSrmmBaseDialog::UpdateFilterButton()

 {

 	db_set_b(m_hContact, CHAT_MODULE, "FilterEnabled", m_bFilterEnabled);