From 9a0c1c27edb2bcd0ab8e6fb4b59039c66218b935 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 10 Aug 2021 22:16:27 -0400
Subject: [PATCH] Remove warnings on closing room
---
resources/qml/RoomList.qml | 3 ++-
resources/qml/TimelineView.qml | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 66cbac5a0..576383e27 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -33,7 +33,8 @@ Page {
Connections {
function onCurrentRoomChanged() {
- roomlist.positionViewAtIndex(Rooms.roomidToIndex(Rooms.currentRoom.roomId), ListView.Contain);
+ if (Rooms.currentRoom)
+ roomlist.positionViewAtIndex(Rooms.roomidToIndex(Rooms.currentRoom.roomId), ListView.Contain);
}
target: Rooms
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 6fc9d51bb..5e99ee5ce 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -85,9 +85,13 @@ Item {
target: timelineView
}
- MessageView {
+ Loader {
+ active: room || roomPreview
Layout.fillWidth: true
- implicitHeight: msgView.height - typingIndicator.height
+ sourceComponent: MessageView {
+ implicitHeight: msgView.height - typingIndicator.height
+ }
+
}
Loader {
--
GitLab