fix: store currently displayed avatar url

okayfiona · Dec 24, 2024 · c8a096c · c8a096c
1 parent 64b35a4
commit c8a096c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -383,6 +383,7 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split)
                     this->seventvAvatar_->start();
                     this->ui_.switchAvatars->getLabel().setText("Show Twitch");
                 }
+                this->updateAvatarUrl();
             });
 
         auto vbox = head.emplace<QVBoxLayout>();
@@ -910,7 +911,8 @@ void UserInfoPopup::updateUserData()
         }
 
         this->userId_ = user.id;
-        this->avatarUrl_ = user.profileImageUrl;
+        this->helixAvatarUrl_ = user.profileImageUrl;
+        this->updateAvatarUrl();
 
         // copyable button for login name of users with a localized username
         if (user.displayName.toLower() != user.login)
@@ -1119,7 +1121,8 @@ void UserInfoPopup::loadAvatar(const HelixUser &user)
                          });
     }
 
-    this->avatarUrl_ = user.profileImageUrl;
+    this->helixAvatarUrl_ = user.profileImageUrl;
+    this->updateAvatarUrl();
 
     if (getSettings()->displaySevenTVAnimatedProfile)
     {
@@ -1158,7 +1161,7 @@ void UserInfoPopup::loadSevenTVAvatar(const HelixUser &user)
             QFile cacheFile(filename);
             if (cacheFile.exists())
             {
-                this->avatarUrl_ = url;
+                this->seventvAvatarUrl_ = url;
                 this->setSevenTVAvatar(filename);
                 return;
             }
@@ -1174,7 +1177,7 @@ void UserInfoPopup::loadSevenTVAvatar(const HelixUser &user)
                              [this, reply, url, filename] {
                                  if (reply->error() == QNetworkReply::NoError)
                                  {
-                                     this->avatarUrl_ = url;
+                                     this->seventvAvatarUrl_ = url;
                                      this->saveCacheAvatar(reply->readAll(),
                                                            filename);
                                      this->setSevenTVAvatar(filename);
@@ -1211,6 +1214,7 @@ void UserInfoPopup::setSevenTVAvatar(const QString &filename)
     this->ui_.switchAvatars->show();
     this->ui_.switchAvatars->getLabel().setText("Show Twitch");
     this->isTwitchAvatarShown_ = false;
+    this->updateAvatarUrl();
 }
 
 void UserInfoPopup::saveCacheAvatar(const QByteArray &avatar,
@@ -1346,4 +1350,16 @@ void UserInfoPopup::TimeoutWidget::paintEvent(QPaintEvent *)
     //    / 2);
 }
 
+void UserInfoPopup::updateAvatarUrl()
+{
+    if (this->isTwitchAvatarShown_)
+    {
+        this->avatarUrl_ = this->helixAvatarUrl_;
+    }
+    else
+    {
+        this->avatarUrl_ = this->seventvAvatarUrl_;
+    }
+}
+
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -58,6 +58,8 @@ class UserInfoPopup final : public DraggablePopup
     void saveCacheAvatar(const QByteArray &avatar,
                          const QString &filename) const;
 
+    void updateAvatarUrl();
+
     bool isMod_{};
     bool isBroadcaster_{};
 
@@ -66,6 +68,8 @@ class UserInfoPopup final : public DraggablePopup
     QString userName_;
     QString userId_;
     QString avatarUrl_;
+    QString helixAvatarUrl_;
+    QString seventvAvatarUrl_;
 
     // The channel the popup was opened from (e.g. /mentions or #forsen). Can be a special channel.
     ChannelPtr channel_;