diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-06 10:49:05 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-06 10:49:05 +0900 |
| commit | 1f62e677ecaffea39ae2fdcc07ac4e1a09d027a1 (patch) | |
| tree | 035f5e37a5085d123b7365a4d81283453311938f /lib | |
| parent | f794be48f23770f438c66e84484fa54e267fcc96 (diff) | |
| download | libquotient-1f62e677ecaffea39ae2fdcc07ac4e1a09d027a1.tar.gz libquotient-1f62e677ecaffea39ae2fdcc07ac4e1a09d027a1.zip | |
Room::calculateDisplayname: fix a misleading room name after leaving a one-on-one
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/room.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/room.cpp b/lib/room.cpp index 5f2e3088..73a0491f 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -1698,8 +1698,9 @@ QString Room::Private::roomNameFromMemberNames(const QList<User *> &userlist) co ); // Spec extension. A single person in the chat but not the local user - // (the local user is apparently invited). - if (userlist.size() == 1 && !isLocalUser(first_two.front())) + // (the local user is invited). + if (userlist.size() == 1 && !isLocalUser(first_two.front()) && + joinState == JoinState::Invite) return tr("Invitation from %1") .arg(q->roomMembername(first_two.front())); |