From 0f09bc6a33604e79996caaf6ff021226e96e53fd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 15 Apr 2023 20:37:26 +0300 Subject: =?UTF-8?q?fixes=20#3458=20(tabSRMM:=20=D0=B4=D0=B2=D0=BE=D1=8F?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/Scriver/src/msglog.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 9371504a9d..8a16ebd013 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -643,20 +643,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 (m_rtf.GetHwnd() == nullptr || lin == nullptr || si == nullptr) + if (m_rtf.GetHwnd() == nullptr || si == nullptr || si == nullptr) return; - if (!bRedraw && (si->iType == GCW_CHATROOM || si->iType == GCW_PRIVMESS) && !(m_pDlg.m_iLogFilterFlags & lin->iType)) + auto &lin = si->arEvents[iStart]; + if (!bRedraw && (si->iType == GCW_CHATROOM || si->iType == GCW_PRIVMESS) && !(m_pDlg.m_iLogFilterFlags & lin.iType)) 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; streamData.isFirst = bRedraw ? 1 : m_rtf.GetRichTextLength() == 0; @@ -702,7 +702,7 @@ public: m_rtf.SendMsg(EM_STREAMIN, wp, (LPARAM)&stream); // do smileys - if (g_dat.smileyAddInstalled && (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_dat.smileyAddInstalled && (bRedraw || (lin.ptszText && lin.iType != GC_EVENT_JOIN && lin.iType != GC_EVENT_NICK && lin.iType != GC_EVENT_ADDSTATUS && lin.iType != GC_EVENT_REMOVESTATUS))) { newsel.cpMax = -1; newsel.cpMin = sel.cpMin; if (newsel.cpMin < 0) -- cgit v1.2.3