Fix #1336: Discord Rich Presence not respecting CVars load (#1345)

Author: 0x416c69

Client/core/CCore.cpp

@@ -1006,6 +1006,9 @@ void CCore::CreateXML()
 
     // Load XML-dependant subsystems
     m_ClientVariables.Load();
+
+    // Initialize discord rich presence after client variables have been loaded completely as it is dependant on CVars
+    m_DiscordManager->Initialize();
 }
 
 void CCore::DestroyGame()

Client/core/CDiscordManager.cpp

@@ -18,11 +18,7 @@
 
 CDiscordManager::CDiscordManager() : m_DiscordCore(nullptr), m_Suicide(false), m_WaitingForServerName(false), m_StoredActivity{}
 {
-    Reconnect(true);            // Try to interact with discord on construction
-    m_Thread = new CThreadHandle(CDiscordManager::DiscordThread, this);
-
-    m_StoredActivity.GetAssets().SetLargeImage("mta_logo_round");            // Always thing
-    m_StoredActivity.GetAssets().SetLargeText("Playing MTA:SA");
+    
 }
 
 CDiscordManager::~CDiscordManager()
@@ -39,6 +35,15 @@ CDiscordManager::~CDiscordManager()
     SAFE_DELETE(m_DiscordCore);
 }
 
+void CDiscordManager::Initialize()
+{
+    Reconnect(true);            // Try to interact with discord on construction
+    m_Thread = new CThreadHandle(CDiscordManager::DiscordThread, this);
+
+    m_StoredActivity.GetAssets().SetLargeImage("mta_logo_round");            // Always thing
+    m_StoredActivity.GetAssets().SetLargeText("Playing MTA:SA");
+}
+
 // Establish connection with discord
 void CDiscordManager::Reconnect(bool bOnInitialization)
 {

Client/core/CDiscordManager.h

@@ -24,6 +24,7 @@ class CDiscordManager : public CDiscordManagerInterface
     static void  OnActivityJoin(const char* joinSecret);
     static void* DiscordThread(void* arg);
 
+    void Initialize();
     void Reconnect(bool bOnInitialization = false);
     void DoPulse();