summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2023-04-15 20:37:26 +0300
committerGeorge Hazan <ghazan@miranda.im>2023-04-15 20:37:26 +0300
commit0f09bc6a33604e79996caaf6ff021226e96e53fd (patch)
treef603883af17f3b72fd5adbf11b8846ef191e8208 /src/core/stdmsg
parent123fa87f68c42b4f121ad315623a9fb5a39ab30c (diff)
fixes #3458 (tabSRMM: двоятся сообщения)
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/msglog.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 92fac27943..d70f1dedee 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -471,20 +471,20 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////
- void LogEvents(struct LOGINFO *lin, bool bRedraw) override
+ void LogEvents(SESSION_INFO *si, int iStart, bool bRedraw) override
{
- auto *si = m_pDlg.m_si;
- if (lin == nullptr || si == nullptr)
+ if (si == nullptr)
return;
- if (!bRedraw && si->iType == GCW_CHATROOM && (m_pDlg.m_iLogFilterFlags & lin->iType) == 0)
+ auto &lin = si->arEvents[iStart];
+ if (!bRedraw && si->iType == GCW_CHATROOM && (m_pDlg.m_iLogFilterFlags & lin.iType) == 0)
return;
LOGSTREAMDATA streamData;
memset(&streamData, 0, sizeof(streamData));
streamData.hwnd = m_rtf.GetHwnd();
streamData.si = si;
- streamData.lin = lin;
+ streamData.iStartEvent = iStart;
streamData.bStripFormat = FALSE;
bool bFlag = false;
@@ -533,7 +533,7 @@ public:
m_rtf.SendMsg(EM_STREAMIN, wp, (LPARAM)&stream);
// do smileys
- if (g_plugin.bSmileyInstalled && (bRedraw || (lin->ptszText && lin->iType != GC_EVENT_JOIN && lin->iType != GC_EVENT_NICK && lin->iType != GC_EVENT_ADDSTATUS && lin->iType != GC_EVENT_REMOVESTATUS))) {
+ if (g_plugin.bSmileyInstalled && (bRedraw || (lin.ptszText && lin.iType != GC_EVENT_JOIN && lin.iType != GC_EVENT_NICK && lin.iType != GC_EVENT_ADDSTATUS && lin.iType != GC_EVENT_REMOVESTATUS))) {
CHARRANGE newsel;
newsel.cpMax = -1;
newsel.cpMin = sel.cpMin;