From 51ebad8717dcda968dc30195d98545b4091ad251 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 15 Sep 2016 09:44:46 +0900 Subject: More compact fix with the same meaning --- room.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/room.cpp b/room.cpp index 9ed3f3d1..5b390cea 100644 --- a/room.cpp +++ b/room.cpp @@ -497,9 +497,8 @@ QString Room::Private::roomNameFromMemberNames(const QList &userlist) co first_two.begin(), first_two.end(), [this](const User* u1, const User* u2) { // Filter out the "me" user so that it never hits the room name - if( u1 == connection->user() || u2 == connection->user() ) - return u2 == connection->user(); - return u1->id() < u2->id(); + return u2 == connection->user() || + (u1 != connection->user() && u1->id() < u2->id()); } ); -- cgit v1.2.3