From 78d287406dcf5f65c8729c29194058ed92559ce8 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:25:16 -0400 Subject: [PATCH] DJUI interactable crash fix --- src/pc/djui/djui_interactable.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pc/djui/djui_interactable.c b/src/pc/djui/djui_interactable.c index 20c1254a..295f6e8b 100644 --- a/src/pc/djui/djui_interactable.c +++ b/src/pc/djui/djui_interactable.c @@ -406,14 +406,16 @@ void djui_interactable_update(void) { u16 mainButtons = PAD_BUTTON_A | PAD_BUTTON_B; if ((mouseButtons & MOUSE_BUTTON_1) && !(sLastMouseButtons && MOUSE_BUTTON_1) && !djui_cursor_inside_base(gInteractableFocus)) { // clicked outside of focused - if (!gDjuiChatBoxFocus && gInteractableFocus != &gDjuiChatBox->chatInput->base) { - djui_interactable_set_input_focus(NULL); - } + // if (!gDjuiChatBoxFocus && gDjuiChatBox != NULL && gInteractableFocus != &gDjuiChatBox->chatInput->base) { + // djui_interactable_set_input_focus(NULL); + // } + djui_interactable_set_input_focus(NULL); } else if ((padButtons & mainButtons) && !(sLastInteractablePad.button & mainButtons)) { // pressed main face button - if (!gDjuiChatBoxFocus && gInteractableFocus != &gDjuiChatBox->chatInput->base) { - djui_interactable_set_input_focus(NULL); - } + // if (!gDjuiChatBoxFocus && gDjuiChatBox != NULL && gInteractableFocus != &gDjuiChatBox->chatInput->base) { + // djui_interactable_set_input_focus(NULL); + // } + djui_interactable_set_input_focus(NULL); } else { djui_interactable_on_focus(gInteractableFocus); }