Don't add any renderers if you can't add any displays

libsdl-org · Dec 4, 2009 · 4a3f57f · 4a3f57f
1 parent f540152
commit 4a3f57f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/src/video/win32/SDL_win32modes.c b/src/video/win32/SDL_win32modes.c
@@ -157,7 +157,7 @@ WIN_AddDisplay(LPTSTR DeviceName)
     return SDL_TRUE;
 }
 
-void
+int
 WIN_InitModes(_THIS)
 {
     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
@@ -192,6 +192,11 @@ WIN_InitModes(_THIS)
             WIN_AddDisplay(DeviceName);
         }
     }
+    if (_this->num_displays == 0) {
+        SDL_SetError("No displays available");
+        return -1;
+    }
+    return 0;
 }
 
 void
@@ -205,10 +210,11 @@ WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
         if (!WIN_GetDisplayMode(data->DeviceName, i, &mode)) {
             break;
         }
-        if (mode.format != SDL_PIXELFORMAT_UNKNOWN)
+        if (mode.format != SDL_PIXELFORMAT_UNKNOWN) {
             if (!SDL_AddDisplayMode(display, &mode)) {
                 SDL_free(mode.driverdata);
             }
+        }
     }
 }
 

diff --git a/src/video/win32/SDL_win32modes.h b/src/video/win32/SDL_win32modes.h
@@ -34,7 +34,7 @@ typedef struct
     DEVMODE DeviceMode;
 } SDL_DisplayModeData;
 
-extern void WIN_InitModes(_THIS);
+extern int WIN_InitModes(_THIS);
 extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
 extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void WIN_QuitModes(_THIS);

diff --git a/src/video/win32/SDL_win32video.c b/src/video/win32/SDL_win32video.c
@@ -207,7 +207,9 @@ VideoBootStrap WIN32_bootstrap = {
 int
 WIN_VideoInit(_THIS)
 {
-    WIN_InitModes(_this);
+    if (WIN_InitModes(_this) < 0) {
+        return -1;
+    }
 
 #if SDL_VIDEO_RENDER_D3D
     D3D_AddRenderDriver(_this);

diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
@@ -118,7 +118,7 @@ X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
     return SDL_PIXELFORMAT_UNKNOWN;
 }
 
-void
+int
 X11_InitModes(_THIS)
 {
     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
@@ -168,6 +168,11 @@ X11_InitModes(_THIS)
         display.driverdata = displaydata;
         SDL_AddVideoDisplay(&display);
     }
+    if (_this->num_displays == 0) {
+        SDL_SetError("No available displays");
+        return -1;
+    }
+    return 0;
 }
 
 /* Global for the error handler */

diff --git a/src/video/x11/SDL_x11modes.h b/src/video/x11/SDL_x11modes.h
@@ -54,7 +54,7 @@ typedef struct
 
 } SDL_DisplayData;
 
-extern void X11_InitModes(_THIS);
+extern int X11_InitModes(_THIS);
 extern void X11_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
 extern int X11_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void X11_QuitModes(_THIS);

diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
@@ -255,7 +255,9 @@ X11_VideoInit(_THIS)
     data->WM_DELETE_WINDOW =
         XInternAtom(data->display, "WM_DELETE_WINDOW", False);
 
-    X11_InitModes(_this);
+    if (X11_InitModes(_this) < 0) {
+        return -1;
+    }
 
 #if SDL_VIDEO_RENDER_X11
     X11_AddRenderDriver(_this);