From c1049d374a3c6d79750c57d2e1751d440df3d8cc Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 17 Oct 2017 17:11:25 +0900
Subject: Fixed a blunder leading to users not having names

If all users suddenly don't have names, update to this commit, delete your cache and run again. Issue since 2bf912d6e6ddd9ff81a92ff28ac8c4c1d8f2d7e1.
---
 user.cpp | 10 ++++++----
 user.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/user.cpp b/user.cpp
index 7caf54e2..171d6d6c 100644
--- a/user.cpp
+++ b/user.cpp
@@ -80,11 +80,13 @@ QString User::name() const
     return d->name;
 }
 
-void User::setName(const QString& newName)
+void User::updateName(const QString& newName)
 {
     const auto oldName = name();
-    if (d->name != oldName)
+    if (d->name != newName)
     {
+        qCDebug(MAIN) << "Renaming" << id()
+                      << "from" << oldName << "to" << newName;
         d->name = newName;
         emit nameChanged(this, oldName);
     }
@@ -93,7 +95,7 @@ void User::setName(const QString& newName)
 void User::rename(const QString& newName)
 {
     auto job = d->connection->callApi<SetDisplayNameJob>(id(), newName);
-    connect(job, &BaseJob::success, this, [=] { setName(newName); });
+    connect(job, &BaseJob::success, this, [=] { updateName(newName); });
 }
 
 QString User::displayname() const
@@ -164,7 +166,7 @@ void User::processEvent(Event* event)
             d->bridged = match.captured(1);
             newName.truncate(match.capturedStart(0));
         }
-        setName(newName);
+        updateName(newName);
         if( d->avatarUrl != e->avatarUrl() )
         {
             d->avatarUrl = e->avatarUrl();
diff --git a/user.h b/user.h
index cf7d4e0a..79a6f5db 100644
--- a/user.h
+++ b/user.h
@@ -67,7 +67,7 @@ namespace QMatrixClient
             void avatarChanged(User* user);
 
         private slots:
-            void setName(const QString& newName);
+            void updateName(const QString& newName);
 
         private:
             class Private;
-- 
cgit v1.2.3