From 7ba65e77997db394fc763bc2ec3234ecf6d65327 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Fri, 29 Dec 2023 19:08:28 -0500 Subject: [PATCH] Fix disconnect key crash --- src/pc/discord/discord_activity.c | 2 +- src/pc/djui/djui_panel_pause.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pc/discord/discord_activity.c b/src/pc/discord/discord_activity.c index 3f8bde0b8..c4cecdd1d 100644 --- a/src/pc/discord/discord_activity.c +++ b/src/pc/discord/discord_activity.c @@ -118,7 +118,7 @@ void discord_activity_update(void) { } else if (gNetworkType == NT_SERVER) { strcpy(sCurActivity.state, "Waiting for players..."); } else { - strcpy(sCurActivity.state, "In-game."); + strcpy(sCurActivity.state, "In the menus."); sCurActivity.party.size.current_size = 1; if (sCurActivity.party.size.max_size < 1) { sCurActivity.party.size.max_size = 1; } } diff --git a/src/pc/djui/djui_panel_pause.c b/src/pc/djui/djui_panel_pause.c index a8823f3b9..b7cb1c5ae 100644 --- a/src/pc/djui/djui_panel_pause.c +++ b/src/pc/djui/djui_panel_pause.c @@ -24,7 +24,7 @@ void djui_panel_pause_quit_yes(UNUSED struct DjuiBase* caller) { } void djui_panel_pause_disconnect_key_update(int scancode) { - if (gDjuiInMainMenu) { return; } + if (gDjuiInMainMenu || find_object_with_behavior(bhvActSelector) != NULL) { return; } for (int i = 0; i < MAX_BINDS; i++) { if (scancode == (int)configKeyDisconnect[i]) {