Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev

1 files changed, 6 insertions, 3 deletions

diff --git a/src/RoomInfoListItem.cpp b/src/RoomInfoListItem.cpp

index 9bcce134..dbcd6806 100644
--- a/src/RoomInfoListItem.cpp
+++ b/src/RoomInfoListItem.cpp
@@ -21,6 +21,7 @@
 #include <QPainter>
 #include <QtGlobal>
 
+#include "AvatarProvider.h"
 #include "Cache.h"
 #include "Config.h"
 #include "RoomInfoListItem.h"
@@ -434,10 +435,12 @@ RoomInfoListItem::mousePressEvent(QMouseEvent *event)
 }
 
 void
-RoomInfoListItem::setAvatar(const QImage &img)
+RoomInfoListItem::setAvatar(const QString &avatar_url)
 {
-        roomAvatar_ = utils::scaleImageToPixmap(img, IconSize);
-        update();
+        AvatarProvider::resolve(avatar_url, IconSize, this, [this](const QPixmap &img) {
+                roomAvatar_ = img;
+                update();
+        });
 }
 
 void