diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2016-09-15 09:44:46 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2016-09-15 09:44:46 +0900 |
commit | 51ebad8717dcda968dc30195d98545b4091ad251 (patch) | |
tree | a90054ab6a44fd9d63c6143a4290bf54bc041e92 | |
parent | 87cb641e36fee7010766c73c32fa45115dec1a3c (diff) | |
download | libquotient-51ebad8717dcda968dc30195d98545b4091ad251.tar.gz libquotient-51ebad8717dcda968dc30195d98545b4091ad251.zip |
More compact fix with the same meaning
-rw-r--r-- | room.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -497,9 +497,8 @@ QString Room::Private::roomNameFromMemberNames(const QList<User *> &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()); } ); |