From e8c22880b93a47e11b09800a76317fa2ff6f7c3f Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Sun, 1 Aug 2010 17:46:13 +0000
Subject: [PATCH] If mouse_toggle_cursor is set to activate, do not toggle
 ursor visibility as mouse_update_cursor_and_grab might decide it should be
 hidden

---
 CHANGELOG.txt    | 1 +
 arch/sdl/mouse.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7232c1e2e..fd4f94f1e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20100801
 --------
 main/menu.c, main/songs.c, main/songs.h, main/gameseq.c, main/digi.h, arch/sdl/digi.c: Builtin music list now dynamically allocated and not limited to 30 songs; Instead of never loading new level when loading savestate ingame, only do this for Redbook and Custom Music playing order 'continously'; if no endlevel song is specified in Custom Music continue with level music
+arch/sdl/mouse.c: If mouse_toggle_cursor is set to activate, do not toggle ursor visibility as mouse_update_cursor_and_grab might decide it should be hidden
 
 20100731
 --------
diff --git a/arch/sdl/mouse.c b/arch/sdl/mouse.c
index 9b66cb0ae..db7075857 100644
--- a/arch/sdl/mouse.c
+++ b/arch/sdl/mouse.c
@@ -243,7 +243,6 @@ void mouse_toggle_cursor(int activate)
 	Mouse.cursor_enabled = (activate && !GameArg.CtlNoMouse);
 	if (Mouse.cursor_enabled)
 	{
-		SDL_ShowCursor(SDL_ENABLE);
 		if (GameArg.CtlGrabMouse)
 			SDL_WM_GrabInput(SDL_GRAB_OFF);
 	}