From a2900c8811c851eee197ec961f7c85b21be937a0 Mon Sep 17 00:00:00 2001 From: Ashnal Date: Fri, 10 Sep 2021 20:25:13 -0400 Subject: [PATCH] Discord joins now force menu close and title demo stop This prevents wierdness from ahving the menu open on teh connection screen It also prevents the connect command from erroring due to being in a demo --- src/discord.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/discord.c b/src/discord.c index ba68da72..3ca9e40b 100644 --- a/src/discord.c +++ b/src/discord.c @@ -156,6 +156,9 @@ static void DRPC_HandleJoin(const char *secret) { char *ip = DRPC_XORIPString(secret); CONS_Printf("Connecting to %s via Discord\n", ip); + M_ClearMenus(true); //Don't have menus open during connection screen + if (demo.playback && demo.title) + G_CheckDemoStatus(); //Stop the title demo, so that the connect command doesn't error if a demo is playing COM_BufAddText(va("connect \"%s\"\n", ip)); free(ip); }