Merge pull request #12205 from LillyJadeKatrin/retroachievements-bugf…

…ix-2 AchievementsWindow: Fix rapid popups on initial opening.
dolphin-emu · Sep 28, 2023 · 5b68449 · 5b68449
2 parents a7c5f2f + 2a9121b
commit 5b68449
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
@@ -65,11 +65,11 @@ AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(pare
   m_total->addWidget(m_user_box);
   m_total->addWidget(m_game_box);
 
-  UpdateData();
-
   m_total->setContentsMargins(0, 0, 0, 0);
   m_total->setAlignment(Qt::AlignTop);
   setLayout(m_total);
+
+  UpdateData();
 }
 
 void AchievementHeaderWidget::UpdateData()

diff --git a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp
@@ -25,6 +25,8 @@ AchievementsWindow::AchievementsWindow(QWidget* parent) : QDialog(parent)
   ConnectWidgets();
   AchievementManager::GetInstance()->SetUpdateCallback(
       [this] { QueueOnObject(this, &AchievementsWindow::UpdateData); });
+
+  UpdateData();
 }
 
 void AchievementsWindow::showEvent(QShowEvent* event)
@@ -44,7 +46,6 @@ void AchievementsWindow::CreateMainLayout()
       GetWrappedWidget(new AchievementSettingsWidget(m_tab_widget, this), this, 125, 100),
       tr("Settings"));
   m_tab_widget->addTab(GetWrappedWidget(m_progress_widget, this, 125, 100), tr("Progress"));
-  m_tab_widget->setTabVisible(1, AchievementManager::GetInstance()->IsGameLoaded());
 
   m_button_box = new QDialogButtonBox(QDialogButtonBox::Close);