Merge fc2ae3b880 into 5800b874d7

Source/Core/DolphinQt/MainWindow.cpp

@@ -2025,14 +2025,9 @@ void MainWindow::ShowAchievementSettings()
 
 void MainWindow::OnHardcoreChanged()
 {
-  bool hardcore_active = AchievementManager::GetInstance().IsHardcoreModeActive();
+  if (AchievementManager::GetInstance().IsHardcoreModeActive())
-  if (hardcore_active)
     Settings::Instance().SetDebugModeEnabled(false);
-  // EmulationStateChanged causes several dialogs to redraw, including anything affected by hardcore
+  emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance()));
-  // 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
 

Source/Core/DolphinQt/MainWindow.h

@@ -270,7 +270,6 @@ 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;