projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed assertion warning when building with SDL 2.0.6 for Android
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 3afecaf918c2e7bd991e3ec36e335cad334a65b3..214859df78ef187e584ce4b42837b653a0f6e0f4 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-532,11
+532,7
@@
inline static void SDLInitVideoBuffer_VideoBuffer(boolean fullscreen)
SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
-#if defined(TARGET_SDL2)
- SDL_SetWindowTitle(sdl_window, program.window_title);
-#else
- SDL_WM_SetCaption(program.window_title, program.window_title);
-#endif
+ SDLSetWindowTitle();
}
inline static void SDLInitVideoBuffer_DrawBuffer()
}
inline static void SDLInitVideoBuffer_DrawBuffer()
@@
-830,6
+826,9
@@
boolean SDLSetVideoMode(boolean fullscreen)
void SDLSetWindowTitle()
{
#if defined(TARGET_SDL2)
void SDLSetWindowTitle()
{
#if defined(TARGET_SDL2)
+ if (sdl_window == NULL)
+ return;
+
SDL_SetWindowTitle(sdl_window, program.window_title);
#else
SDL_WM_SetCaption(program.window_title, program.window_title);
SDL_SetWindowTitle(sdl_window, program.window_title);
#else
SDL_WM_SetCaption(program.window_title, program.window_title);