Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #12029 from LillyJadeKatrin/retroachievements-bugf…
…ix-2

RetroAchievements - Rearranged startup process
  • Loading branch information
JMC47 committed Sep 6, 2023
2 parents 3b5b9e0 + 348e60c commit c0440df
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Source/Core/DolphinQt/MainWindow.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
Expand All @@ -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);

Expand Down

0 comments on commit c0440df

Please sign in to comment.