Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix case when joining discord lobby without a password

This commit is contained in:
MysterD 2023-04-15 20:27:28 -07:00
parent 8477a285a9
commit fd97b78b27
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pc/discord/discord_activity.c
View File

@ -33,10 +33,15 @@ static void on_activity_join(UNUSED void* data, const char* secret) {
// extract lobby password
token = strtok(NULL, ":");
if (token == NULL) { token = ""; }
// join
if (gNetworkType != NT_NONE) {
network_shutdown(true, false, false, false);
}
gCoopNetDesiredLobby = lobbyId;
snprintf(gCoopNetPassword, 64, "%s", token);
network_reset_reconnect_and_rehost();
network_set_system(NS_COOPNET);
network_init(NT_CLIENT, false);

8
src/pc/network/coopnet/coopnet.c
View File

@ -22,6 +22,7 @@ static uint64_t sLocalLobbyId = 0;
static uint64_t sLocalLobbyOwnerId = 0;
static enum NetworkType sNetworkType;
static bool sReconnecting = false;
static bool sIntentionalDisconnect = false;
static CoopNetRc coopnet_initialize(void);
@ -39,7 +40,9 @@ static void coopnet_on_connected(uint64_t userId) {
static void coopnet_on_disconnected(void) {
LOG_INFO("Coopnet shutdown!");
djui_popup_create(DLANG(NOTIF, COOPNET_DISCONNECTED), 2);
if (!sIntentionalDisconnect) {
djui_popup_create(DLANG(NOTIF, COOPNET_DISCONNECTED), 2);
}
coopnet_shutdown();
gCoopNetCallbacks.OnLobbyListGot = NULL;
gCoopNetCallbacks.OnLobbyListFinish = NULL;
@ -167,9 +170,12 @@ static void ns_coopnet_get_lobby_secret(UNUSED char* destination, UNUSED u32 des
static void ns_coopnet_shutdown(bool reconnecting) {
if (reconnecting) { return; }
LOG_INFO("Coopnet shutdown!");
sIntentionalDisconnect = true;
coopnet_shutdown();
gCoopNetCallbacks.OnLobbyListGot = NULL;
gCoopNetCallbacks.OnLobbyListFinish = NULL;
coopnet_update();
sIntentionalDisconnect = false;
sLocalLobbyId = 0;
sLocalLobbyOwnerId = 0;