From 348e60cd3f4a9d940fedf5d98dc02bb2a06d8973 Mon Sep 17 00:00:00 2001 From: LillyJadeKatrin Date: Sat, 17 Jun 2023 14:13:38 -0400 Subject: [PATCH] Rearranged RetroAchievements startup process Moved AchievementManager Init further down in the MainWindow constructor; its original position was because it had an impact on the contents of the menu bar, and this is no longer the case. --- Source/Core/DolphinQt/MainWindow.cpp | 10 +++++----- 1 file 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 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 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);