From 1f62e677ecaffea39ae2fdcc07ac4e1a09d027a1 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 6 May 2018 10:49:05 +0900 Subject: Room::calculateDisplayname: fix a misleading room name after leaving a one-on-one --- lib/room.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') 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 &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())); -- cgit v1.2.3