Merge pull request #28 from Fxrh/correct-roomname-by-usernames

Correct user sorting for room name creation

1 files changed, 2 insertions, 1 deletions

diff --git a/room.cpp b/room.cpp
index c7bf0208..5b390cea 100644
--- a/room.cpp
+++ b/room.cpp
@@ -497,7 +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
-            return u1 != connection->user() && u1->id() < u2->id();
+            return u2 == connection->user() ||
+                    (u1 != connection->user() && u1->id() < u2->id());
         }
     );