diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-09-26 13:34:09 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-09-26 13:34:09 +0300 |
| commit | b8ebaa0bdb6be17e014d7a382b86af8c028cf00d (patch) | |
| tree | 5ff2f2e64e9bf2f0d214fbc9af1d8a661d934c17 /src/mir_app | |
| parent | aa23f64e684fd892a2ae51eacb71c66434efc4d0 (diff) | |
Group chat options are applied alongside the private window options update
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index 73c6eb540a..df0b70c420 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -774,7 +774,7 @@ MIR_APP_DLL(void) Chat_UpdateOptions() {
for (auto &si : g_arSessions)
if (si->pDlg)
- si->pDlg->UpdateOptions();
+ si->pDlg->OnOptionsApplied();
}
MIR_APP_DLL(int) Chat_IsMuted(MCONTACT hContact)
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 8a939f15af..986b1c5182 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -321,7 +321,7 @@ Srmm_FindDialog @406 NONAME ?UpdateStatusBar@CSrmmBaseDialog@@UAEXXZ @417 NONAME
Chat_UpdateOptions @418 NONAME
?RedrawLog@CSrmmBaseDialog@@QAEXXZ @419 NONAME
-?UpdateOptions@CSrmmBaseDialog@@UAEXXZ @420 NONAME
+?UpdateChatOptions@CSrmmBaseDialog@@QAEXXZ @420 NONAME
?ShowColorChooser@CSrmmBaseDialog@@QAEXH@Z @421 NONAME
?ShowFilterMenu@CSrmmBaseDialog@@UAEXXZ @422 NONAME
?OnInitDialog@CSrmmBaseDialog@@MAE_NXZ @423 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index f36d40f651..3d6eca5103 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -321,7 +321,7 @@ Srmm_FindDialog @406 NONAME ?UpdateStatusBar@CSrmmBaseDialog@@UEAAXXZ @417 NONAME
Chat_UpdateOptions @418 NONAME
?RedrawLog@CSrmmBaseDialog@@QEAAXXZ @419 NONAME
-?UpdateOptions@CSrmmBaseDialog@@UEAAXXZ @420 NONAME
+?UpdateChatOptions@CSrmmBaseDialog@@QEAAXXZ @420 NONAME
?ShowColorChooser@CSrmmBaseDialog@@QEAAXH@Z @421 NONAME
?ShowFilterMenu@CSrmmBaseDialog@@UEAAXXZ @422 NONAME
?OnInitDialog@CSrmmBaseDialog@@MEAA_NXZ @423 NONAME
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 499bf58b67..3f69bf8fed 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -568,6 +568,7 @@ INT_PTR CSrmmBaseDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) {
switch (msg) {
case DM_OPTIONSAPPLIED:
+ m_pLog->UpdateOptions();
OnOptionsApplied();
return 0;
@@ -637,9 +638,8 @@ bool CSrmmBaseDialog::IsSuitableEvent(const LOGINFO &lin) const return (m_si->iType == GCW_SERVER || (m_iLogFilterFlags & lin.iType));
}
-void CSrmmBaseDialog::UpdateOptions()
+void CSrmmBaseDialog::UpdateChatOptions()
{
- m_pLog->UpdateOptions();
UpdateFilterButton();
MODULEINFO *mi = m_si->pMI;
|