Commit 4218be92 authored by Sam Lantinga's avatar Sam Lantinga

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");
}

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401299
parent 039ea901
...@@ -208,9 +208,9 @@ void SDL_SetCursor (SDL_Cursor *cursor) ...@@ -208,9 +208,9 @@ void SDL_SetCursor (SDL_Cursor *cursor)
if ( SDL_cursor && (SDL_cursorstate&CURSOR_VISIBLE) ) { if ( SDL_cursor && (SDL_cursorstate&CURSOR_VISIBLE) ) {
/* Use window manager cursor if possible */ /* Use window manager cursor if possible */
if ( SDL_cursor->wm_cursor && if ( SDL_cursor->wm_cursor &&
video->ShowWMCursor(this, SDL_cursor->wm_cursor) ) video->ShowWMCursor(this, SDL_cursor->wm_cursor) ) {
SDL_cursorstate &= ~CURSOR_USINGSW; SDL_cursorstate &= ~CURSOR_USINGSW;
else { } else {
SDL_cursorstate |= CURSOR_USINGSW; SDL_cursorstate |= CURSOR_USINGSW;
if ( video->ShowWMCursor ) { if ( video->ShowWMCursor ) {
video->ShowWMCursor(this, NULL); video->ShowWMCursor(this, NULL);
......
...@@ -643,6 +643,7 @@ SDL_Surface * SDL_SetVideoMode (int width, int height, int bpp, Uint32 flags) ...@@ -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 */ /* Reset the keyboard here so event callbacks can run */
SDL_ResetKeyboard(); SDL_ResetKeyboard();
SDL_ResetMouse(); SDL_ResetMouse();
SDL_cursorstate &= ~CURSOR_USINGSW;
/* Clean up any previous video mode */ /* Clean up any previous video mode */
if ( SDL_PublicSurface != NULL ) { if ( SDL_PublicSurface != NULL ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment