summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2023-09-28 20:34:35 +0300
committerGeorge Hazan <george.hazan@gmail.com>2023-09-28 20:34:35 +0300
commitbb4f90d0ee557ba9da2d866b89363e58920f9500 (patch)
tree334271788cc5fe75c716a32fdaf5545d45a01b0e /src
parent9243bce2213d16bc7963c206fa76cf18f644bb6b (diff)
fixes #3691 (tabSRMM: перестала работать настройка "Фон журнала")
Diffstat (limited to 'src')
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp2
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
-rw-r--r--src/mir_app/src/srmm_base.cpp6
4 files changed, 9 insertions, 1 deletions
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);