From 87cb641e36fee7010766c73c32fa45115dec1a3c Mon Sep 17 00:00:00 2001 From: Felix Rohrbach Date: Thu, 15 Sep 2016 00:26:05 +0200 Subject: Correct user sorting for room name creation In the previous version, it was possible that u1 >= u2 and u2 >= u1: Assume u1 == me, u1->id() < u2->id() Then u1 >= u2, as u1 == me (i.e. it returns false) but also u2 >= u1, as u2->id() > u1->id() (returns false again) For me, this had the effect of having three rooms called fxrh. --- room.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/room.cpp b/room.cpp index c7bf0208..9ed3f3d1 100644 --- a/room.cpp +++ b/room.cpp @@ -497,7 +497,9 @@ 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 - return u1 != connection->user() && u1->id() < u2->id(); + if( u1 == connection->user() || u2 == connection->user() ) + return u2 == connection->user(); + return u1->id() < u2->id(); } ); -- cgit v1.2.3