More checks to avoid errors on forgetting room

2019-07-07 22:49:28 -04:00 · 2019-07-07 22:49:28 -04:00 · d26f087df9
commit d26f087df9
parent 2170b16175
3 changed files with 2 additions and 4 deletions
--- a/TODO.md
+++ b/TODO.md
@ -1,5 +1,3 @@
- room doesn't change category when accept/reject invite
-
 - "rejoin" leftbanner button if room is public
 - daybreak color
 - html links color
--- a/src/qml/Chat/Banners/InviteBanner.qml
+++ b/src/qml/Chat/Banners/InviteBanner.qml
@ -13,7 +13,7 @@ Banner {
    avatar.userId: inviterId

    labelText: qsTr("%1 invited you to join the room.").arg(
-        inviterId ?
+        inviterId && inviterInfo ?
        Utils.coloredNameHtml(inviterInfo.displayName, inviterId) :
        qsTr("Someone")
    )
--- a/src/qml/Chat/Banners/LeftBanner.qml
+++ b/src/qml/Chat/Banners/LeftBanner.qml
@ -9,7 +9,7 @@ Banner {

    // TODO: avatar func auto
    avatar.userId: userId
-    avatar.imageUrl: users.find(userId).avatarUrl
+    avatar.imageUrl: userInfo ? userInfo.avatarUrl : null
    labelText: qsTr("You are not part of this room anymore.")

    buttonModel: [