Commit a4f447a

authored

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

1 parent f28e008 commit a4f447aCopy full SHA for a4f447a

File tree

+14

-5

lines changed

+14

-5

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1006,6 +1006,9 @@ void CCore::CreateXML()`
`1006`	`1006`
`1007`	`1007`	`// Load XML-dependant subsystems`
`1008`	`1008`	`m_ClientVariables.Load();`
	`1009`	`+`
	`1010`	`+ // Initialize discord rich presence after client variables have been loaded completely as it is dependant on CVars`
	`1011`	`+ m_DiscordManager->Initialize();`
`1009`	`1012`	`}`
`1010`	`1013`
`1011`	`1014`	`void CCore::DestroyGame()`

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,7 @@`
`18`	`18`
`19`	`19`	`CDiscordManager::CDiscordManager() : m_DiscordCore(nullptr), m_Suicide(false), m_WaitingForServerName(false), m_StoredActivity{}`
`20`	`20`	`{`
`21`		`- Reconnect(true); // Try to interact with discord on construction`
`22`		`- m_Thread = new CThreadHandle(CDiscordManager::DiscordThread, this);`
`23`		`-`
`24`		`- m_StoredActivity.GetAssets().SetLargeImage("mta_logo_round"); // Always thing`
`25`		`- m_StoredActivity.GetAssets().SetLargeText("Playing MTA:SA");`
	`21`	`+`
`26`	`22`	`}`
`27`	`23`
`28`	`24`	`CDiscordManager::~CDiscordManager()`
`@@ -39,6 +35,15 @@ CDiscordManager::~CDiscordManager()`
`39`	`35`	`SAFE_DELETE(m_DiscordCore);`
`40`	`36`	`}`
`41`	`37`
	`38`	`+void CDiscordManager::Initialize()`
	`39`	`+{`
	`40`	`+ Reconnect(true); // Try to interact with discord on construction`
	`41`	`+ m_Thread = new CThreadHandle(CDiscordManager::DiscordThread, this);`
	`42`	`+`
	`43`	`+ m_StoredActivity.GetAssets().SetLargeImage("mta_logo_round"); // Always thing`
	`44`	`+ m_StoredActivity.GetAssets().SetLargeText("Playing MTA:SA");`
	`45`	`+}`
	`46`	`+`
`42`	`47`	`// Establish connection with discord`
`43`	`48`	`void CDiscordManager::Reconnect(bool bOnInitialization)`
`44`	`49`	`{`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class CDiscordManager : public CDiscordManagerInterface`
`24`	`24`	`static void OnActivityJoin(const char* joinSecret);`
`25`	`25`	`static void* DiscordThread(void* arg);`
`26`	`26`
	`27`	`+ void Initialize();`
`27`	`28`	`void Reconnect(bool bOnInitialization = false);`
`28`	`29`	`void DoPulse();`
`29`	`30`

Comments

(0)