diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-01-18 14:20:19 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-01-18 14:20:19 +0300 |
| commit | 6ed0f28f9288a76e479b916f2e579b1a61ac47fd (patch) | |
| tree | 3d8f87c6b52e2f1b4e234a50d7fd5c6b22897830 /src/mir_app | |
| parent | a6173f891d255c44118f135992a6d5585ad22490 (diff) | |
Srmm_IsCustomLogUsed should take the 'forGroupchats' parameter into consideration
Diffstat (limited to 'src/mir_app')
| -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 |
3 files changed, 6 insertions, 3 deletions
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;
}
|