yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 21:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't call SDL_GetWindowDisplayIndex() with window == NULL

Browse source 
I got an SDL assertion because of this.
The problem was that PrintDisplayModes() was called at startup before a
window was created.
This commit is contained in:
Daniel Gibson 2019-09-22 19:09:10 +02:00
parent 9bb0425e36
commit 77493e6e5b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/vid/glimp_sdl.c
View file

@ -263,10 +263,11 @@ InitDisplayIndices()
static void static void
PrintDisplayModes(void) PrintDisplayModes(void)
{ {
int curdisplay = SDL_GetWindowDisplayIndex(window); int curdisplay = window ? SDL_GetWindowDisplayIndex(window) : 0;
// On X11 (at least for me) // On X11 (at least for me)
// curdisplay is always -1. // curdisplay is always -1.
// DG: probably because window was NULL?
if (curdisplay < 0) { if (curdisplay < 0) {
curdisplay = 0; curdisplay = 0;
} }