From 0d177bde467e4610b7c08db42fd995c8629e8dd9 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 16 Apr 2023 21:04:11 -0700
Subject: [PATCH] Fix joining a discord invite while already in game

---
 src/pc/discord/discord_activity.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pc/discord/discord_activity.c b/src/pc/discord/discord_activity.c
index 53b9ebd16..be0015010 100644
--- a/src/pc/discord/discord_activity.c
+++ b/src/pc/discord/discord_activity.c
@@ -9,6 +9,7 @@
 
 extern struct DiscordApplication app;
 struct DiscordActivity sCurActivity = { 0 };
+static int sQueuedLobby = 0;
 
 static void on_activity_update_callback(UNUSED void* data, enum EDiscordResult result) {
     LOG_INFO("> on_activity_update_callback returned %d", result);
@@ -42,11 +43,7 @@ static void on_activity_join(UNUSED void* data, const char* secret) {
     }
     gCoopNetDesiredLobby = lobbyId;
     snprintf(gCoopNetPassword, 64, "%s", token);
-
-    network_reset_reconnect_and_rehost();
-    network_set_system(NS_COOPNET);
-    network_init(NT_CLIENT, false);
-    djui_panel_join_message_create(NULL);
+    sQueuedLobby = 2;
 #endif
 }
 
@@ -139,6 +136,15 @@ void discord_activity_update(void) {
 }
 
 void discord_activity_update_check(void) {
+    if (sQueuedLobby > 0) {
+        if (--sQueuedLobby == 0) {
+            network_reset_reconnect_and_rehost();
+            network_set_system(NS_COOPNET);
+            network_init(NT_CLIENT, false);
+            djui_panel_join_message_create(NULL);
+        }
+    }
+
     if (gNetworkType == NT_NONE) { return; }
     bool shouldUpdate = false;
     u8 connectedCount = network_player_connected_count();