Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do more Discord API cleanup on network shutdown

This commit is contained in:
MysterD 2022-05-11 01:33:56 -07:00
parent 91988cc426
commit 2c9f42abd6
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pc/network/discord/discord_network.c
View File

@ -76,8 +76,9 @@ void discord_network_init(int64_t lobbyId) {
} }
void discord_network_shutdown(void) { void discord_network_shutdown(void) {
app.lobbies->flush_network(app.lobbies);
if (gCurLobbyId == 0) { return; } if (gCurLobbyId == 0) { return; }
app.lobbies->flush_network(app.lobbies);
app.lobbies->disconnect_network(app.lobbies, gCurLobbyId); app.lobbies->disconnect_network(app.lobbies, gCurLobbyId);
app.lobbies->flush_network(app.lobbies);
LOGFILE_INFO(LFT_DISCORD, "shutdown network, lobby = " DISCORD_ID_FORMAT, gCurLobbyId); LOGFILE_INFO(LFT_DISCORD, "shutdown network, lobby = " DISCORD_ID_FORMAT, gCurLobbyId);
} }

7
src/pc/network/discord/lobby.c
View File

@ -115,6 +115,13 @@ void discord_lobby_leave(void) {
LOGFILE_INFO(LFT_DISCORD, "left lobby " DISCORD_ID_FORMAT, gCurLobbyId); LOGFILE_INFO(LFT_DISCORD, "left lobby " DISCORD_ID_FORMAT, gCurLobbyId);
if (snprintf(gCurActivity.party.id, 128, "%s", "none") < 0) {
LOGFILE_ERROR(LFT_DISCORD, "Truncating party id");
}
gCurActivity.party.size.current_size = 1;
gCurActivity.party.size.max_size = 1;
discord_activity_update(gNetworkType == NT_SERVER);
isHosting = false; isHosting = false;
gCurLobbyId = 0; gCurLobbyId = 0;
} }

1
src/pc/network/network.c
View File

@ -77,6 +77,7 @@ bool network_init(enum NetworkType inNetworkType) {
return false; return false;
} }
network_forget_all_reliable();
crash_handler_init(); crash_handler_init();
// set server settings // set server settings