From fc14a8eac89e860438082f486cb4765239a5748a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 16 Nov 2024 13:51:47 -0500 Subject: [PATCH] Ensure it's not possible for the recommended space avatar to assert (cherry picked from commit 1b0027e1d26681b1035fb248ea04425636e01cd8) --- src/qml/RecommendedSpaceDialog.qml | 2 +- src/qml/SpaceDrawer.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/RecommendedSpaceDialog.qml b/src/qml/RecommendedSpaceDialog.qml index 57ba6f39a..92927c0df 100644 --- a/src/qml/RecommendedSpaceDialog.qml +++ b/src/qml/RecommendedSpaceDialog.qml @@ -32,7 +32,7 @@ Kirigami.Dialog { contentItem: RowLayout { spacing: Kirigami.Units.largeSpacing * 4 Avatar { - source: root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) + source: SpaceHierarchyCache.recommendedSpaceAvatar.toString().length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : 0 name: SpaceHierarchyCache.recommendedSpaceDisplayName } ColumnLayout { diff --git a/src/qml/SpaceDrawer.qml b/src/qml/SpaceDrawer.qml index 45b3699bc..69e07aadf 100644 --- a/src/qml/SpaceDrawer.qml +++ b/src/qml/SpaceDrawer.qml @@ -219,7 +219,7 @@ QQC2.Control { visible: SpaceHierarchyCache.recommendedSpaceId.length > 0 && !root.connection.room(SpaceHierarchyCache.recommendedSpaceId) && !SpaceHierarchyCache.recommendedSpaceHidden text: i18nc("Join ", "Join %1", SpaceHierarchyCache.recommendedSpaceDisplayName) - source: SpaceHierarchyCache.recommendedSpaceAvatar.length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : "" + source: SpaceHierarchyCache.recommendedSpaceAvatar.toString().length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : "" onSelected: { recommendedSpaceDialogComponent.createObject(QQC2.Overlay.overlay, { connection: root.connection