From 421f436871beb0cf517a11a2ca83a16c71c4aef4 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sat, 23 Nov 2024 22:20:05 +0000
Subject: [PATCH] Fix MessageContentModel crash

Make sure we check that the RoomMessageEvent exists before accessing anything
---
 src/models/messagecontentmodel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp
index 1d06f7434..97fcf91e1 100644
--- a/src/models/messagecontentmodel.cpp
+++ b/src/models/messagecontentmodel.cpp
@@ -499,7 +499,10 @@ void MessageContentModel::updateReplyModel()
     }
 
     const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
-    if (!roomMessageEvent->isReply() || (roomMessageEvent && roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
+    if (roomMessageEvent == nullptr) {
+        return;
+    }
+    if (!roomMessageEvent->isReply() || (roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
         if (m_replyModel) {
             delete m_replyModel;
         }