diff options
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 3 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.h | 1 | ||||
| -rw-r--r-- | src/mir_app/src/modules.cpp | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index f35167ff41..966b212cc8 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1380,7 +1380,8 @@ void CMsgDialog::OnOptionsApplied(bool bUpdateAvatar) m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (WPARAM)&cf);
m_pLog->Clear();
- RemakeLog();
+ if (!isChat())
+ RemakeLog();
FixTabIcons();
}
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 3784956335..8b371b93d5 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -551,10 +551,6 @@ void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) m_pDlg.m_hDbEventLast = streamData.hDbEventLast;
}
-void CLogWindow::LogEvents(DBEVENTINFO*, bool)
-{
-}
-
void CLogWindow::UpdateOptions()
{
if (m_pDlg.isChat())
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 7b77bae289..8665599e8e 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -43,7 +43,6 @@ public: void Attach() override;
void LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) override;
- void LogEvents(DBEVENTINFO *dbei, bool bAppend);
void LogEvents(struct LOGINFO *, bool) override;
void UpdateOptions() override;
diff --git a/src/mir_app/src/modules.cpp b/src/mir_app/src/modules.cpp index 59d1b5d0b5..2af9ae6b30 100644 --- a/src/mir_app/src/modules.cpp +++ b/src/mir_app/src/modules.cpp @@ -145,7 +145,8 @@ int LoadDefaultModules(void) if (LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first
if (LoadHelpModule()) return 1;
-
+ if (LoadStdPlugins()) return 1;
+
Langpack_SortDuplicates();
if (LoadAccountsModule()) return 1;
@@ -155,7 +156,6 @@ int LoadDefaultModules(void) if (LoadIgnoreModule()) return 1;
if (LoadVisibilityModule()) return 1;
if (LoadIdleModule()) return 1;
- if (LoadStdPlugins()) return 1;
return 0;
}
|