Merge fc2ae3b880 into a163877413

Merge pull request #13746 from LillyJadeKatrin/retroachievements-hardcore-changed
MainWindow - Avoid excessive emulation state changes
2025-06-16 12:17:55 +00:00 · 2025-06-10 19:28:36 -07:00 · 2025-06-10 17:32:04 -04:00 · 2025-06-10 16:03:14 -04:00
2 changed files with 8 additions and 2 deletions
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@ -2025,9 +2025,14 @@ void MainWindow::ShowAchievementSettings()

 void MainWindow::OnHardcoreChanged()
 {
-  if (AchievementManager::GetInstance().IsHardcoreModeActive())
+  bool hardcore_active = AchievementManager::GetInstance().IsHardcoreModeActive();
+  if (hardcore_active)
    Settings::Instance().SetDebugModeEnabled(false);
-  emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance()));
+  // EmulationStateChanged causes several dialogs to redraw, including anything affected by hardcore
+  // mode. Every dialog that depends on hardcore mode is redrawn by EmulationStateChanged.
+  if (hardcore_active != m_former_hardcore_setting)
+    emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance()));
+  m_former_hardcore_setting = hardcore_active;
 }
 #endif  // USE_RETRO_ACHIEVEMENTS

--- a/Source/Core/DolphinQt/MainWindow.h
+++ b/Source/Core/DolphinQt/MainWindow.h
@ -270,6 +270,7 @@ private:
 #ifdef USE_RETRO_ACHIEVEMENTS
  AchievementsWindow* m_achievements_window = nullptr;
  Config::ConfigChangedCallbackID m_config_changed_callback_id;
+  bool m_former_hardcore_setting = false;
 #endif  // USE_RETRO_ACHIEVEMENTS

  AssemblerWidget* m_assembler_widget;
Author	SHA1	Message	Date
sepalani	5d460e9d16	Merge `fc2ae3b880` into `a163877413`	2025-06-10 19:28:36 -07:00
JMC47	a163877413	Merge pull request #13746 from LillyJadeKatrin/retroachievements-hardcore-changed MainWindow - Avoid excessive emulation state changes	2025-06-10 17:32:04 -04:00
LillyJadeKatrin	417badc55c	MainWindow - Avoid excessive emulation state changes Updates the Hardcore Changed callback to only signal EmulationStateChanged if the new Hardcore Mode setting is different from the previous one.	2025-06-10 16:03:14 -04:00