Fix #1349 crash introduced in PR #1345 (#1350)

* Fix a bug with discord rich presence not respecting CVars load * Fix crash at #1349 * Fix coding style
multitheftauto · Apr 6, 2020 · 3d92acd · 3d92acd
1 parent 3b95ff4
commit 3d92acd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Client/core/CDiscordManager.cpp b/Client/core/CDiscordManager.cpp
@@ -16,7 +16,7 @@
 #define DISCORD_CLIENT_ID 468493322583801867
 #endif
 
-CDiscordManager::CDiscordManager() : m_DiscordCore(nullptr), m_Suicide(false), m_WaitingForServerName(false), m_StoredActivity{}
+CDiscordManager::CDiscordManager() : m_DiscordCore(nullptr), m_Suicide(false), m_WaitingForServerName(false), m_StoredActivity{}, m_Initialized(false)
 {
 
 }
@@ -42,6 +42,8 @@ void CDiscordManager::Initialize()
 
     m_StoredActivity.GetAssets().SetLargeImage("mta_logo_round");            // Always thing
     m_StoredActivity.GetAssets().SetLargeText("Playing MTA:SA");
+
+    m_Initialized = true;
 }
 
 // Establish connection with discord
@@ -173,6 +175,8 @@ void* CDiscordManager::DiscordThread(void* arg)
 // establishing connection with discord is sometimes time-consuming, especially when it's not running
 void CDiscordManager::DoPulse()
 {
+    if (!m_Initialized) return; // Wait until initialization
+
     if (!m_DiscordCore)
     {
         // Discord is not initialized, maybe it's not installed or not yet running

diff --git a/Client/core/CDiscordManager.h b/Client/core/CDiscordManager.h
@@ -56,6 +56,7 @@ class CDiscordManager : public CDiscordManagerInterface
     discord::Activity m_StoredActivity;
 
     bool m_WaitingForServerName;
+    bool m_Initialized;
 
     volatile bool m_Suicide;            // Thread kill command