From 31a83c515e115170a0e9c31783d94b48e6b62d15 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 22 Mar 2020 14:22:42 +0100
Subject: [PATCH] Fix broken avatars in quick switcher

---
 src/popups/PopupItem.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/popups/PopupItem.cpp b/src/popups/PopupItem.cpp
index db97e4a34..5513f942c 100644
--- a/src/popups/PopupItem.cpp
+++ b/src/popups/PopupItem.cpp
@@ -113,7 +113,8 @@ RoomItem::RoomItem(QWidget *parent, const RoomSearchResult &res)
         topLayout_->addWidget(avatar_);
         topLayout_->addWidget(roomName_, 1);
 
-        avatar_->setImage(QString::fromStdString(res.info.avatar_url));
+        if (!res.info.avatar_url.empty())
+                avatar_->setImage(QString::fromStdString(res.info.avatar_url));
 }
 
 void
@@ -128,7 +129,11 @@ RoomItem::updateItem(const RoomSearchResult &result)
 
         roomName_->setText(name);
 
-        avatar_->setImage(QString::fromStdString(result.info.avatar_url));
+        // if there is not an avatar set for the room, we want to at least show the letter
+        // correctly!
+        avatar_->setLetter(utils::firstChar(name));
+        if (!result.info.avatar_url.empty())
+                avatar_->setImage(QString::fromStdString(result.info.avatar_url));
 }
 
 void
-- 
GitLab