Fixed crash when dynamic X11 fails to load system Xlib libraries at r…

…untime.
libsdl-org · Nov 17, 2005 · 0b8bd70 · 0b8bd70
1 parent 0ee4774
commit 0b8bd70
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
@@ -104,11 +104,10 @@ int SDL_X11_LoadSymbols(void)
 		#ifdef X11_DYNAMIC
 			x11_handle = SDL_LoadObject(x11_library);
 			x11ext_handle = SDL_LoadObject(x11ext_library);
-			if ((x11_handle != NULL) && (x11ext_handle != NULL)) {
-				#define SDL_X11_SYM(r,fn,arg) p##fn = X11_GetSym(#fn, &rc);
-				#include "SDL_x11sym.h"
-				#undef SDL_X11_SYM
-			}
+			rc = ((x11_handle != NULL) && (x11ext_handle != NULL));
+			#define SDL_X11_SYM(r,fn,arg) p##fn = X11_GetSym(#fn, &rc);
+			#include "SDL_x11sym.h"
+			#undef SDL_X11_SYM
 
 			if (!rc)
 				SDL_X11_UnloadSymbols();  /* in case one of these loaded... */