diff options
| author | JMC47 <JMC4789@gmail.com> | 2023-09-06 12:23:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 12:23:52 -0400 |
| commit | c0440df2882e09e87efae199cdef28669d7c85ef (patch) | |
| tree | ad8cec3062b36449637943fb5a310637422cda99 /Source | |
| parent | 3b5b9e0fc02f32f1a05f1061ea10c634d1dae6d7 (diff) | |
| parent | 348e60cd3f4a9d940fedf5d98dc02bb2a06d8973 (diff) | |
Merge pull request #12029 from LillyJadeKatrin/retroachievements-bugfix-2
RetroAchievements - Rearranged startup process
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 5698b2acfa..5e9bc67896 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -42,6 +42,7 @@ #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/CommonTitles.h" +#include "Core/Config/AchievementSettings.h" #include "Core/Config/MainSettings.h" #include "Core/Config/NetplaySettings.h" #include "Core/Config/WiimoteSettings.h" @@ -227,11 +228,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters, InitControllers(); -#ifdef USE_RETRO_ACHIEVEMENTS - // This has to be done before CreateComponents() so it's initialized. - AchievementManager::GetInstance()->Init(); -#endif // USE_RETRO_ACHIEVEMENTS - CreateComponents(); ConnectGameList(); @@ -256,6 +252,10 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters, NetPlayInit(); +#ifdef USE_RETRO_ACHIEVEMENTS + AchievementManager::GetInstance()->Init(); +#endif // USE_RETRO_ACHIEVEMENTS + #if defined(__unix__) || defined(__unix) || defined(__APPLE__) auto* daemon = new SignalDaemon(this); |