From bbf9cfb618b0e9191e35a7801352d4fc7d84192b Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Sat, 9 Mar 2024 21:03:18 -0500
Subject: [PATCH] FINALLY fix that mouse hiding bug that's been bothering me
 forever

---
 src/pc/controller/controller_sdl1.c | 2 +-
 src/pc/djui/djui_interactable.c     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pc/controller/controller_sdl1.c b/src/pc/controller/controller_sdl1.c
index d4991536..3b579026 100644
--- a/src/pc/controller/controller_sdl1.c
+++ b/src/pc/controller/controller_sdl1.c
@@ -125,7 +125,7 @@ static void controller_sdl_init(void) {
                 joy_axis_binds[i] = -1;
     }
  
-    if (newcam_mouse == 1)
+    if (newcam_mouse == 1 && gMenuMode == -1 && !gDjuiChatBoxFocus && !gDjuiConsoleFocus)
         SDL_WM_GrabInput(SDL_GRAB_ON);
     SDL_GetRelativeMouseState(&mouse_x, &mouse_y);
 
diff --git a/src/pc/djui/djui_interactable.c b/src/pc/djui/djui_interactable.c
index 4216c8da..4c205367 100644
--- a/src/pc/djui/djui_interactable.c
+++ b/src/pc/djui/djui_interactable.c
@@ -187,7 +187,6 @@ void djui_interactable_set_input_focus(struct DjuiBase* base) {
     djui_interactable_on_focus_end(gInteractableFocus);
     gInteractableFocus = base;
     djui_interactable_on_focus_begin(base);
-    djui_cursor_set_visible(base == NULL);
 }
 
 bool djui_interactable_is_input_focus(struct DjuiBase* base) {