summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-03-22 18:14:53 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2020-03-22 18:14:53 +0100
commit7df65293105ceddd0d628a60077a4190d7e15a13 (patch)
treeeb243a972a9c0cd32664065793a556ebe3329e0f /src
parentClean up unused avatar functions (diff)
downloadnheko-7df65293105ceddd0d628a60077a4190d7e15a13.tar.xz
Fix avatar not being set for some rooms in the top bar
Diffstat (limited to 'src')
-rw-r--r--src/ChatPage.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 91ecd58a..7b706c76 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -717,11 +717,8 @@ ChatPage::changeTopRoomInfo(const QString &room_id) top_bar_->updateRoomName(name); top_bar_->updateRoomTopic(QString::fromStdString(room_info[room_id].topic)); - auto img = cache::getRoomAvatar(room_id); - - if (img.isNull()) - top_bar_->updateRoomAvatarFromName(name); - else + top_bar_->updateRoomAvatarFromName(name); + if (!avatar_url.isEmpty()) top_bar_->updateRoomAvatar(avatar_url); } catch (const lmdb::error &e) {