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.
This commit is contained in:
parent
900439ea0d
commit
348e60cd3f
|
@ -42,6 +42,7 @@
|
||||||
#include "Core/Boot/Boot.h"
|
#include "Core/Boot/Boot.h"
|
||||||
#include "Core/BootManager.h"
|
#include "Core/BootManager.h"
|
||||||
#include "Core/CommonTitles.h"
|
#include "Core/CommonTitles.h"
|
||||||
|
#include "Core/Config/AchievementSettings.h"
|
||||||
#include "Core/Config/MainSettings.h"
|
#include "Core/Config/MainSettings.h"
|
||||||
#include "Core/Config/NetplaySettings.h"
|
#include "Core/Config/NetplaySettings.h"
|
||||||
#include "Core/Config/WiimoteSettings.h"
|
#include "Core/Config/WiimoteSettings.h"
|
||||||
|
@ -227,11 +228,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
|
||||||
|
|
||||||
InitControllers();
|
InitControllers();
|
||||||
|
|
||||||
#ifdef USE_RETRO_ACHIEVEMENTS
|
|
||||||
// This has to be done before CreateComponents() so it's initialized.
|
|
||||||
AchievementManager::GetInstance()->Init();
|
|
||||||
#endif // USE_RETRO_ACHIEVEMENTS
|
|
||||||
|
|
||||||
CreateComponents();
|
CreateComponents();
|
||||||
|
|
||||||
ConnectGameList();
|
ConnectGameList();
|
||||||
|
@ -256,6 +252,10 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
|
||||||
|
|
||||||
NetPlayInit();
|
NetPlayInit();
|
||||||
|
|
||||||
|
#ifdef USE_RETRO_ACHIEVEMENTS
|
||||||
|
AchievementManager::GetInstance()->Init();
|
||||||
|
#endif // USE_RETRO_ACHIEVEMENTS
|
||||||
|
|
||||||
#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
|
#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
|
||||||
auto* daemon = new SignalDaemon(this);
|
auto* daemon = new SignalDaemon(this);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue