don't ungrab mouse in loading screens in fullscreen

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 044dc6dbf02b8bdb8d76e8a5929e41ab4f1f8c6a..fb52f0410a96270f34eaef99670e4e2fb4ecec31 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2038,7 +2038,8 @@ void SCR_UpdateLoadingScreen (qboolean clear)
        if (vid_hidden || !scr_refresh.integer)
                return;
        // release mouse grab while loading
-       VID_GrabMouse(false);
+       if (!vid.fullscreen)
+               VID_GrabMouse(false);
        CHECKGLERROR
        qglViewport(0, 0, vid.width, vid.height);CHECKGLERROR
        //qglDisable(GL_SCISSOR_TEST);CHECKGLERROR
@@ -2277,7 +2278,7 @@ void CL_UpdateScreen(void)
        else if (key_dest == key_menu_grabbed)
                grabmouse = true;
        else if (key_dest == key_menu)
-               grabmouse = in_client_mouse;
+               grabmouse = !in_client_mouse;
        else if (key_dest == key_game)
                grabmouse = vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove;
        else