From 4b1afdbe2d451d8cc8dc69215f9cf167fe5a4841 Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 31 Dec 2024 16:13:27 +0000 Subject: [PATCH] Fix Thread Chatbars Since the new thread API was released in 0.9.2 update the if defs to include it. This will solve the double chat bar in thread for anyone on 0.9.2 or above --- src/models/messagecontentmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp index 0369727a2..1a9a4c702 100644 --- a/src/models/messagecontentmodel.cpp +++ b/src/models/messagecontentmodel.cpp @@ -12,7 +12,7 @@ #include #include #include -#if Quotient_VERSION_MINOR > 9 +#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1) #include #endif @@ -478,7 +478,7 @@ QList MessageContentModel::messageContentComponents(bool isEdi } // If the event is already threaded the ThreadModel will handle displaying a chat bar. -#if Quotient_VERSION_MINOR > 9 +#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1) if (isThreading && roomMessageEvent && !(roomMessageEvent->isThreaded() || m_room->threads().contains(roomMessageEvent->id()))) { #else if (isThreading && roomMessageEvent && roomMessageEvent->isThreaded()) {