Fixed crash:

#include <SDL.h> int main(int argc, char** argv) { SDL_Init(SDL_INIT_EVERYTHING); SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN); SDL_ShowCursor(SDL_DISABLE); SDL_Delay(1000); SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN | SDL_OPENGL); SDL_Quit(); printf("Everything okay\n"); }
libsdl-org · Jan 30, 2006 · 0b9a5b1 · 0b9a5b1
1 parent 49ed6d7
commit 0b9a5b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/video/SDL_cursor.c b/src/video/SDL_cursor.c
@@ -208,9 +208,9 @@ void SDL_SetCursor (SDL_Cursor *cursor)
 	if ( SDL_cursor && (SDL_cursorstate&CURSOR_VISIBLE) ) {
 		/* Use window manager cursor if possible */
 		if ( SDL_cursor->wm_cursor && 
-	             video->ShowWMCursor(this, SDL_cursor->wm_cursor) )
+	             video->ShowWMCursor(this, SDL_cursor->wm_cursor) ) {
 			SDL_cursorstate &= ~CURSOR_USINGSW;
-		else {
+		} else {
 			SDL_cursorstate |= CURSOR_USINGSW;
 			if ( video->ShowWMCursor ) {
 				video->ShowWMCursor(this, NULL);

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -643,6 +643,7 @@ SDL_Surface * SDL_SetVideoMode (int width, int height, int bpp, Uint32 flags)
 	/* Reset the keyboard here so event callbacks can run */
 	SDL_ResetKeyboard();
 	SDL_ResetMouse();
+	SDL_cursorstate &= ~CURSOR_USINGSW;
 
 	/* Clean up any previous video mode */
 	if ( SDL_PublicSurface != NULL ) {