Apply same setParent changes to addMessage

Chatterino · Nov 5, 2023 · a35a43d · a35a43d
1 parent 6745c5e
commit a35a43d
Showing 1 changed file with 12 additions and 7 deletions.
diff --git 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);
         }
     }