Browse Source

Merge pull request #1834 from Areloch/SDLSplashImageFixes2

Also adds a sanity check in the event a splash image isn't found.
Areloch 8 years ago
parent
commit
7af95e6a8e
1 changed files with 9 additions and 6 deletions
  1. 9 6
      Engine/source/windowManager/sdl/sdlSplashScreen.cpp

+ 9 - 6
Engine/source/windowManager/sdl/sdlSplashScreen.cpp

@@ -39,16 +39,19 @@ bool Platform::displaySplashWindow( String path )
    gSplashImage = SDL_LoadBMP(path);
    gSplashImage = SDL_LoadBMP(path);
 
 
    //now the pop-up window
    //now the pop-up window
-   gSplashWindow = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 
-      gSplashImage->w, gSplashImage->h, SDL_WINDOW_BORDERLESS | SDL_WINDOW_SHOWN);
+   if (gSplashImage)
+   {
+      gSplashWindow = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+         gSplashImage->w, gSplashImage->h, SDL_WINDOW_BORDERLESS | SDL_WINDOW_SHOWN);
 
 
-   gSplashRenderer = SDL_CreateRenderer(gSplashWindow, -1, SDL_RENDERER_ACCELERATED);
+      gSplashRenderer = SDL_CreateRenderer(gSplashWindow, -1, SDL_RENDERER_ACCELERATED);
 
 
-   gSplashTexture = SDL_CreateTextureFromSurface(gSplashRenderer, gSplashImage);
+      gSplashTexture = SDL_CreateTextureFromSurface(gSplashRenderer, gSplashImage);
 
 
-   SDL_RenderCopy(gSplashRenderer, gSplashTexture, NULL, NULL);
+      SDL_RenderCopy(gSplashRenderer, gSplashTexture, NULL, NULL);
 
 
-   SDL_RenderPresent(gSplashRenderer);
+      SDL_RenderPresent(gSplashRenderer);
+   }
 
 
 	return true;
 	return true;
 }
 }