Synchronize changes from 1.6 master branch [ci skip]

d7fb4cf Hotfix Discord-RPC from nightly Feedbacks (#3220)
multitheftauto · Oct 24, 2023 · 7d6b249 · 7d6b249
2 parents c8d2715 + d7fb4cf
commit 7d6b249
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Client/core/CDiscordRichPresence.cpp b/Client/core/CDiscordRichPresence.cpp
@@ -73,6 +73,9 @@ void CDiscordRichPresence::SetDefaultData()
 
     m_uiDiscordAppStart = 0;
     m_uiDiscordAppEnd = 0;
+
+    m_iPartySize = 0;
+    m_iPartyMax = 0;
 }
 
 void CDiscordRichPresence::UpdatePresence()

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.cpp
@@ -58,7 +58,13 @@ bool CLuaDiscordDefs::ResetData()
 {
     auto discord = g_pCore->GetDiscord();
 
-    if (!discord || !discord->IsDiscordRPCEnabled() || !discord->ResetDiscordData())
+    if (!discord || !discord->IsDiscordRPCEnabled())
+        return false;
+
+    if (discord->IsDiscordCustomDetailsDisallowed())
+        return false;
+
+    if (!discord->ResetDiscordData())
         return false;
 
     return true;