diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_options.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgoptions.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_log.cpp | 5 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index a2354b48a2..2518807485 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -332,7 +332,7 @@ int ChatOptionsInitialize(WPARAM wParam) odp.pDialog = new COptMainDlg(); g_plugin.addOptions(wParam, &odp); - if (!Chat::bEnableCustomLogs) { + if (!Srmm_IsCustomLogUsed(true)) { odp.position = 910000001; odp.szTab.a = LPGEN("Chat log"); odp.pDialog = new COptLogDlg(); diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 2f9bd7e906..a3206d7e05 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -572,7 +572,7 @@ int OptInitialise(WPARAM wParam, LPARAM) g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Messaging log");
- odp.pDialog = new COptionLogDlg(Srmm_IsCustomLogUsed() ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
+ odp.pDialog = new COptionLogDlg(Srmm_IsCustomLogUsed(false) ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);
g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Typing notify");
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 9a82e8e1f0..20d41c159c 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -886,7 +886,7 @@ Clist_GroupSaveExpanded @1003 NONAME ??1MAsyncObject@@UAE@XZ @1017 NONAME
??_7MAsyncObject@@6B@ @1018 NONAME
?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME
-?Srmm_IsCustomLogUsed@@YG_NXZ @1020 NONAME
+?Srmm_IsCustomLogUsed@@YG_N_N@Z @1020 NONAME
?IconFlashTime@Clist@@3V?$CMOption@I@@A @1021 NONAME
?Srmm_Quote@@YG?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@PB_WH@Z @1022 NONAME
?SetMessageText@CSrmmBaseDialog@@QAEXPB_W_N@Z @1023 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 64227040f5..5761132572 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -886,7 +886,7 @@ Clist_GroupSaveExpanded @1003 NONAME ??1MAsyncObject@@UEAA@XZ @1017 NONAME
??_7MAsyncObject@@6B@ @1018 NONAME
?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME
-?Srmm_IsCustomLogUsed@@YA_NXZ @1020 NONAME
+?Srmm_IsCustomLogUsed@@YA_N_N@Z @1020 NONAME
?IconFlashTime@Clist@@3V?$CMOption@I@@A @1021 NONAME
?Srmm_Quote@@YA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@PEB_WH@Z @1022 NONAME
?SetMessageText@CSrmmBaseDialog@@QEAAXPEB_W_N@Z @1023 NONAME
diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp index 61dd70601c..aaf466264b 100644 --- a/src/mir_app/src/srmm_log.cpp +++ b/src/mir_app/src/srmm_log.cpp @@ -85,8 +85,11 @@ MIR_APP_DLL(SrmmLogWindowClass *) Srmm_GetWindowClass(CMsgDialog *pDlg) return nullptr; // shall never happen
}
-MIR_APP_DLL(bool) Srmm_IsCustomLogUsed()
+MIR_APP_DLL(bool) Srmm_IsCustomLogUsed(bool forGroupChats)
{
+ if (forGroupChats && !Chat::bEnableCustomLogs)
+ return false;
+
return mir_strcmp(g_logger, "built-in") != 0;
}
|