diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-04-18 15:32:28 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-04-18 15:32:28 -0400 |
| commit | a402e85a0ff5d53d6266327d2d7bde6a0e86b595 (patch) | |
| tree | c02aa613c88f7cbc88c2ad156ca09f2e8cfa94b1 /src/timeline | |
| parent | Merge pull request #554 from Jedi18/display_name_wording (diff) | |
| download | nheko-a402e85a0ff5d53d6266327d2d7bde6a0e86b595.tar.xz | |
Fix display name referenced for incorrect event types
Diffstat (limited to 'src/timeline')
| -rw-r--r-- | src/timeline/TimelineModel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 1148985b..6108df1c 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1463,9 +1463,8 @@ TimelineModel::formatMemberEvent(QString id) } } - QString user = QString::fromStdString(event->state_key); - QString name = utils::replaceEmoji(displayName(user)); - QString oldName = QString::fromStdString(prevEvent->content.display_name); + QString user = QString::fromStdString(event->state_key); + QString name = utils::replaceEmoji(displayName(user)); QString rendered; // see table https://matrix.org/docs/spec/client_server/latest#m-room-member @@ -1476,6 +1475,8 @@ TimelineModel::formatMemberEvent(QString id) break; case Membership::Join: if (prevEvent && prevEvent->content.membership == Membership::Join) { + QString oldName = QString::fromStdString(prevEvent->content.display_name); + bool displayNameChanged = prevEvent->content.display_name != event->content.display_name; bool avatarChanged = |