diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-06-06 22:42:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 22:42:53 +0200 |
| commit | 81b6bfaa1e1804cf9d8ba4068fcbfe2c92a19e98 (patch) | |
| tree | 6f8a274956eeb41ff5f8f47742a399cef307c856 /Source/Core/DolphinQt/MenuBar.cpp | |
| parent | ca22d0af574376594395cf562c86fb60343fb4a9 (diff) | |
| parent | 22aa88109f5a5964e1b66d31221647cafab7f0f5 (diff) | |
Merge pull request #12832 from JosJuice/retro-achievements-less-ifdefs
Use a stub AchivementManager when USE_RETRO_ACHIEVEMENTS isn't defined
Diffstat (limited to 'Source/Core/DolphinQt/MenuBar.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MenuBar.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index fc94065624..75b279db67 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -127,14 +127,9 @@ void MenuBar::OnEmulationStateChanged(Core::State state) m_screenshot_action->setEnabled(running); m_state_save_menu->setEnabled(running); -#ifdef USE_RETRO_ACHIEVEMENTS const bool hardcore = AchievementManager::GetInstance().IsHardcoreModeActive(); m_state_load_menu->setEnabled(running && !hardcore); m_frame_advance_action->setEnabled(running && !hardcore); -#else // USE_RETRO_ACHIEVEMENTS - m_state_load_menu->setEnabled(running); - m_frame_advance_action->setEnabled(running); -#endif // USE_RETRO_ACHIEVEMENTS // Movie m_recording_read_only->setEnabled(running); @@ -144,11 +139,7 @@ void MenuBar::OnEmulationStateChanged(Core::State state) m_recording_export->setEnabled(false); } m_recording_play->setEnabled(m_game_selected && !running); -#ifdef USE_RETRO_ACHIEVEMENTS m_recording_play->setEnabled(m_game_selected && !running && !hardcore); -#else // USE_RETRO_ACHIEVEMENTS - m_recording_play->setEnabled(m_game_selected && !running); -#endif // USE_RETRO_ACHIEVEMENTS m_recording_start->setEnabled((m_game_selected || running) && !Core::System::GetInstance().GetMovie().IsPlayingInput()); |