RedHat patch: SDL-1.2.14-xio_error-rh603984.patch

--HG--
branch : SDL-1.2
This commit is contained in:
Sam Lantinga 2010-07-18 11:24:37 -07:00
parent 1973eb05db
commit 54b35e5565
2 changed files with 5 additions and 1 deletions

View file

@ -230,6 +230,10 @@ void X11_CheckMouseModeNoLock(_THIS)
char *env_override;
int enable_relative = 1;
/* This happens when quiting after an xio error */
if ( SDL_Display == NULL )
return;
/* Allow the user to override the relative mouse mode.
They almost never want to do this, as it seriously affects
applications that rely on continuous relative mouse motion.

View file

@ -329,7 +329,7 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, SDL_GrabMode mode)
{
int result;
if ( this->screen == NULL ) {
if ( this->screen == NULL || SDL_Display == NULL ) {
return(SDL_GRAB_OFF);
}
if ( ! SDL_Window ) {