summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-08-05 13:54:18 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-08-05 13:54:18 +0300
commitfa02fba01b1a24fda16501c26f33b90710b4f9eb (patch)
tree47395c3f65f9bc8edb26ad0a76e4403f8d3c682a /src/core/stdmsg
parentb334ced17b8a0493ca2070a0065b1954f5a82abe (diff)
fixes #2512 (StdMsg: broken group chat colors in the embedded log window)
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp3
-rw-r--r--src/core/stdmsg/src/msglog.cpp4
-rw-r--r--src/core/stdmsg/src/msgs.h1
3 files changed, 2 insertions, 6 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;