aboutsummaryrefslogtreecommitdiff
path: root/room.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'room.cpp')
-rw-r--r--room.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/room.cpp b/room.cpp
index 73591c98..51c5f5cc 100644
--- a/room.cpp
+++ b/room.cpp
@@ -64,7 +64,7 @@ class Room::Private
Private(Connection* c, QString id_, JoinState initialJoinState)
: q(nullptr), connection(c), id(std::move(id_))
- , avatar(c), joinState(initialJoinState)
+ , joinState(initialJoinState)
{ }
Room* q;
@@ -287,7 +287,7 @@ QImage Room::avatar(int dimension)
QImage Room::avatar(int width, int height)
{
if (!d->avatar.url().isEmpty())
- return d->avatar.get(width, height, [=] { emit avatarChanged(); });
+ return d->avatar.get(connection(), width, height, [=] { emit avatarChanged(); });
// Use the other side's avatar for 1:1's
if (d->membersMap.size() == 2)
@@ -295,8 +295,8 @@ QImage Room::avatar(int width, int height)
auto theOtherOneIt = d->membersMap.begin();
if (theOtherOneIt.value() == localUser())
++theOtherOneIt;
- return (*theOtherOneIt)->avatarObject()
- .get(width, height, [=] { emit avatarChanged(); });
+ return (*theOtherOneIt)->avatar(width, height,
+ [=] { emit avatarChanged(); });
}
return {};
}