From a12a44b722b0471ddd5d5e3ed30dcae0fb35e646 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sun, 7 May 2023 09:40:11 +0200
Subject: [PATCH] Fix crash in media url

---
 src/models/messageeventmodel.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index 0b07e553c..4fa493695 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -1115,12 +1115,16 @@ QVariantMap MessageEventModel::getMediaInfoFromFileInfo(const EventContent::File
 
     // Get the mxc URL for the media.
 #ifdef QUOTIENT_07
-    QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());
-
-    if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
-        mediaInfo["source"] = source;
-    } else {
+    if (!fileInfo->url().isValid() || eventId.isEmpty()) {
         mediaInfo["source"] = QUrl();
+    } else {
+        QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());
+
+        if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
+            mediaInfo["source"] = source;
+        } else {
+            mediaInfo["source"] = QUrl();
+        }
     }
 #else
     auto url = QUrl(m_currentRoom->connection()->homeserver().toString() + "/_matrix/media/r0/download/" + fileInfo->url.toString().remove("mxc://"));