From: Holger Schemel <info@artsoft.org>
Date: Mon, 2 Mar 2015 10:18:56 +0000 (+0100)
Subject: improved error tolerance of SDL native surface conversion
X-Git-Tag: 4.0.0.0-rc1~277
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=f4c7859fd8e746c60aa3b4eb50313eebf71e1045

improved error tolerance of SDL native surface conversion
---

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 2217842e..e7e98505 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -207,11 +207,13 @@ boolean SDLSetNativeSurface(SDL_Surface **surface)
 
 SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
 {
-  if (surface == NULL ||
-      backbuffer == NULL ||
-      backbuffer->surface == NULL)
+  if (surface == NULL)
     return NULL;
 
+  if (backbuffer == NULL ||
+      backbuffer->surface == NULL)
+    return SDL_ConvertSurface(surface, surface->format, 0);
+
   return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
 }