Merge remote-tracking branch 'origin/master' into nheko_loading_spinner

3 files changed, 5 insertions, 7 deletions

diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp

index 0bc8759e..f78ef09b 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -181,7 +181,7 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent)
           roomid_.toStdString(),
           [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr &err) {
                   if (err) {
-                          if (err->status_code == boost::beast::http::status::not_found)
+                          if (err->status_code == 404)
                                   http::client()->get_pushrules(
                                     "global",
                                     "room",
diff --git a/src/ui/Theme.cpp b/src/ui/Theme.cpp

index 26119393..732a0443 100644
--- a/src/ui/Theme.cpp
+++ b/src/ui/Theme.cpp
@@ -47,7 +47,7 @@ Theme::paletteFromTheme(std::string_view theme)
                 darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());
                 darkActive.setColor(QPalette::ToolTipText, darkActive.text().color());
                 darkActive.setColor(QPalette::Link, QColor("#38a3d8"));
-                darkActive.setColor(QPalette::ButtonText, "#727274");
+                darkActive.setColor(QPalette::ButtonText, "#828284");
                 return darkActive;
         } else {
                 return original;
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp

index da130242..3d9c4b6a 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -39,7 +39,8 @@ UserProfile::UserProfile(QString roomid,
                 getGlobalProfileData();
         }
 
-        if (!cache::client() || !cache::client()->isDatabaseReady())
+        if (!cache::client() || !cache::client()->isDatabaseReady() ||
+            !ChatPage::instance()->timelineManager())
                 return;
 
         connect(cache::client(),
@@ -127,10 +128,7 @@ UserProfile::displayName()
 QString
 UserProfile::avatarUrl()
 {
-        return (isGlobalUserProfile() && globalAvatarUrl != "")
-                 ? globalAvatarUrl
-                 : cache::avatarUrl(roomid_, userid_);
-        ;
+        return isGlobalUserProfile() ? globalAvatarUrl : cache::avatarUrl(roomid_, userid_);
 }
 
 bool