summary refs log tree commit diff
path: root/src/timeline/TimelineModel.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-02-03 03:26:44 +0100
committerGitHub <noreply@github.com>2021-02-03 03:26:44 +0100
commite0207ff337b954e72c90b73e43527baa2c0b33a4 (patch)
treefb8ecf83dadec49096bb06c01684a53ea980d17e /src/timeline/TimelineModel.cpp
parentCleanup privacy screen, no more grabImage (diff)
parentMerge branch 'master' into avatar_username_feature (diff)
downloadnheko-e0207ff337b954e72c90b73e43527baa2c0b33a4.tar.xz
Merge pull request #445 from Jedi18/avatar_username_feature
Change user avatar (global and room avatar)
Diffstat (limited to 'src/timeline/TimelineModel.cpp')
-rw-r--r--src/timeline/TimelineModel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index 79cf5184..968ec3c7 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -801,7 +801,10 @@ TimelineModel::viewDecryptedRawMessage(QString id) const void TimelineModel::openUserProfile(QString userid, bool global) { - emit openProfile(new UserProfile(global ? "" : room_id_, userid, manager_, this)); + UserProfile *userProfile = new UserProfile(global ? "" : room_id_, userid, manager_, this); + connect( + this, &TimelineModel::roomAvatarUrlChanged, userProfile, &UserProfile::updateAvatarUrl); + emit openProfile(userProfile); } void