summary refs log tree commit diff
path: root/resources/qml/TimelineView.qml
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-09-03 19:51:50 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-09-16 23:49:17 +0200
commitb05c10102148a388a5abedc890db52abc70d71b5 (patch)
tree363429b6cd8613d7e9bb8deea1b4ff379b1b9c4a /resources/qml/TimelineView.qml
parentReenable top bar room settings menus on avatar or title clicks (diff)
downloadnheko-b05c10102148a388a5abedc890db52abc70d71b5.tar.xz
Fix null errors in qml
Diffstat (limited to 'resources/qml/TimelineView.qml')
-rw-r--r--resources/qml/TimelineView.qml13
1 files changed, 8 insertions, 5 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 49f523a5..e4643635 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -167,8 +167,9 @@ Page {
 
 						width: avatarSize
 						height: avatarSize
-						url: chat.model.roomAvatarUrl.replace("mxc://", "image://MxcImage/")
-						displayName: chat.model.roomName
+
+						url: chat.model ? chat.model.roomAvatarUrl.replace("mxc://", "image://MxcImage/") : ""
+						displayName: chat.model ? chat.model.roomName : qsTr("No room selected")
 
 						MouseArea {
 							anchors.fill: parent
@@ -182,7 +183,8 @@ Page {
 						Layout.row: 0
 
 						font.pointSize: fontMetrics.font.pointSize * 1.1
-						text: chat.model.roomName
+
+						text: chat.model ? chat.model.roomName : qsTr("No room selected")
 
 						MouseArea {
 							anchors.fill: parent
@@ -193,9 +195,10 @@ Page {
 						Layout.fillWidth: true
 						Layout.column: 2
 						Layout.row: 1
-						text: chat.model.roomTopic
 						Layout.maximumHeight: fontMetrics.lineSpacing * 2 // show 2 lines
 						clip: true
+
+						text: chat.model ? chat.model.roomTopic : ""
 					}
 
 					ImageButton {
@@ -387,7 +390,7 @@ Page {
 
 						Label { 
 							id: userName
-							text: chat.model.escapeEmoji(modelData.userName)
+							text: timelineManager.escapeEmoji(modelData.userName)
 							color: timelineManager.userColor(modelData.userId, colors.window)
 							textFormat: Text.RichText