From e5505dd171cb5541c08b8e16b316441d99c91032 Mon Sep 17 00:00:00 2001
From: Indev <bdmitry450@gmail.com>
Date: Mon, 11 Sep 2023 13:17:12 +0300
Subject: [PATCH] Shutdown DiscordRPC when discordrp cvar is set to Off

---
 src/discord.c | 32 ++++++++++++++++++++++++++++++--
 src/discord.h |  7 +++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/discord.c b/src/discord.c
index 96d922a0b..4a361a3f0 100644
--- a/src/discord.c
+++ b/src/discord.c
@@ -37,7 +37,9 @@
 // length of IP strings
 #define IP_SIZE 21
 
-consvar_t cv_discordrp = CVAR_INIT ("discordrp", "On", CV_SAVE|CV_CALL, CV_OnOff, DRPC_UpdatePresence);
+static void Discordrp_OnChange(void);
+
+consvar_t cv_discordrp = CVAR_INIT ("discordrp", "On", CV_SAVE|CV_CALL, CV_OnOff, Discordrp_OnChange);
 consvar_t cv_discordstreamer = CVAR_INIT ("discordstreamer", "Off", CV_SAVE, CV_OnOff, NULL);
 consvar_t cv_discordasks = CVAR_INIT ("discordasks", "Yes", CV_SAVE|CV_CALL, CV_YesNo, DRPC_UpdatePresence);
 
@@ -330,10 +332,36 @@ void DRPC_Init(void)
 	handlers.joinRequest = DRPC_HandleJoinRequest;
 
 	Discord_Initialize(DISCORD_APPID, &handlers, 1, NULL);
-	I_AddExitFunc(Discord_Shutdown);
+	I_AddExitFunc(DRPC_Shutdown);
 	DRPC_UpdatePresence();
 }
 
+void DRPC_Shutdown(void)
+{
+	if (!drpc_init)
+	{
+		CONS_Printf("DiscordRPC never started\n");
+		return;
+	}
+
+	CONS_Printf("Shutting down DiscordRPC\n");
+
+	Discord_Shutdown();
+	drpc_init = false;
+}
+
+static void Discordrp_OnChange(void)
+{
+	if (cv_discordrp.value)
+	{
+		DRPC_UpdatePresence();
+	}
+	else
+	{
+		DRPC_Shutdown();
+	}
+}
+
 /*--------------------------------------------------
 	static void DRPC_GotServerIP(UINT32 address)
 
diff --git a/src/discord.h b/src/discord.h
index 587be6a42..310e6d6cb 100644
--- a/src/discord.h
+++ b/src/discord.h
@@ -68,6 +68,13 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest);
 void DRPC_Init(void);
 
 
+/*--------------------------------------------------
+	void DRPC_Shutdown(void);
+
+		Shutdown Discord Rich Presence if it was started at all.
+--------------------------------------------------*/
+void DRPC_Shutdown(void);
+
 /*--------------------------------------------------
 	void DRPC_UpdatePresence(void);