Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-10 01:56:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up have-initialized resources in some failing edge cases.

Browse Source 
Maybe fixes Bugzilla #426.

--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon
2007-06-15 06:57:31 +00:00
parent 6fe7ece68f
commit 762d7c5698
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/x11/SDL_x11video.c
View File

@@ -408,7 +408,7 @@ static void create_aux_windows(_THIS)
}
}
/* Setup the communication with the IM server */
/* Setup the communication with the IM server */
SDL_IM = NULL;
SDL_IC = NULL;
@@ -483,6 +483,8 @@ static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat)
*/
GFX_Display = XOpenDisplay(display);
if ( GFX_Display == NULL ) {
XCloseDisplay(SDL_Display);
SDL_Display = NULL;
SDL_SetError("Couldn't open X11 display");
return(-1);
}
@@ -508,8 +510,13 @@ static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat)
#endif /* NO_SHARED_MEMORY */
/* Get the available video modes */
if(X11_GetVideoModes(this) < 0)
if(X11_GetVideoModes(this) < 0) {
XCloseDisplay(GFX_Display);
GFX_Display = NULL;
XCloseDisplay(SDL_Display);
SDL_Display = NULL;
return -1;
}
/* Determine the current screen size */
this->info.current_w = DisplayWidth(SDL_Display, SDL_Screen);