The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12878 from LillyJadeKatrin/retroachievements-hardcore-state-changed

Browse Source 
Decouple Hardcore from EmulationStateChanged
This commit is contained in:
JMC47 2024-06-23 18:13:56 -04:00 committed by GitHub
commit c536754ffe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
View File

@ -236,7 +236,10 @@ void AchievementSettingsWidget::ToggleRAIntegration()
else else
instance.Shutdown(); instance.Shutdown();
if (Config::Get(Config::RA_HARDCORE_ENABLED)) if (Config::Get(Config::RA_HARDCORE_ENABLED))
{
emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance())); emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance()));
emit Settings::Instance().HardcoreStateChanged();
}
} }
void AchievementSettingsWidget::Login() void AchievementSettingsWidget::Login()
@ -266,6 +269,7 @@ void AchievementSettingsWidget::ToggleHardcore()
Settings::Instance().SetDebugModeEnabled(false); Settings::Instance().SetDebugModeEnabled(false);
} }
emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance())); emit Settings::Instance().EmulationStateChanged(Core::GetState(Core::System::GetInstance()));
emit Settings::Instance().HardcoreStateChanged();
} }
void AchievementSettingsWidget::ToggleUnofficial() void AchievementSettingsWidget::ToggleUnofficial()

2
Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp
View File

@ -34,6 +34,8 @@ AchievementsWindow::AchievementsWindow(QWidget* parent) : QDialog(parent)
}); });
}); });
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
[this] { m_settings_widget->UpdateData(); });
connect(&Settings::Instance(), &Settings::HardcoreStateChanged, this,
[this] { AchievementsWindow::UpdateData({.all = true}); }); [this] { AchievementsWindow::UpdateData({.all = true}); });
} }

1
Source/Core/DolphinQt/Settings.h
View File

@ -223,6 +223,7 @@ signals:
void SDCardInsertionChanged(bool inserted); void SDCardInsertionChanged(bool inserted);
void USBKeyboardConnectionChanged(bool connected); void USBKeyboardConnectionChanged(bool connected);
void EnableGfxModsChanged(bool enabled); void EnableGfxModsChanged(bool enabled);
void HardcoreStateChanged();
private: private:
Settings(); Settings();