From a35a43dfb54e95e3b26e5b9ecd104f475330bf52 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 5 Nov 2023 17:05:51 +0100 Subject: [PATCH] Apply same setParent changes to addMessage --- src/providers/twitch/IrcMessageHandler.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 2737ca5289f..10df4435991 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/src/providers/twitch/IrcMessageHandler.cpp @@ -1359,28 +1359,33 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, parentIt != tags.end()) { const QString parentID = parentIt.value().toString(); - MessagePtr parent; if (replyID == parentID) { if (rootThread) { - parent = rootThread->root(); + builder.setParent(rootThread->root()); } } else { auto parentThreadIt = channel->threads().find(parentID); - if (parentThreadIt != channel->threads().end() && - !parentThreadIt->second.expired()) + if (parentThreadIt != channel->threads().end()) { - parent = parentThreadIt->second.lock()->root(); + auto thread = parentThreadIt->second.lock(); + if (thread) + { + builder.setParent(thread->root()); + } } else { - parent = channel->findMessage(parentID); + auto parent = channel->findMessage(parentID); + if (parent) + { + builder.setParent(parent); + } } } - builder.setParent(parent); } }