AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 03:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix init. with invalid video_display setting (again) (#1576)

Browse Source 
commit d38fd80fed89 ("fix 21:9 aspect ratio, tweak DRS parameters")
added some code that uses `video_display` before it is checked by
`I_ResetInvalidDisplayIndex`, which causes Woof! to exit with an error
if it has an invalid value (e.g. as a result of unplugging monitors).

Fix it by moving `I_ResetInvalidDisplayIndex` to an earlier point.
This commit is contained in:
Joan Bruguera 2024-03-10 15:22:12 +00:00 committed by GitHub
parent b32c4df60f
commit a21559ea95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i_video.c
View File

@ -1365,6 +1365,7 @@ static void I_InitVideoParms(void)
int p, tmp_scalefactor; int p, tmp_scalefactor;
SDL_DisplayMode mode; SDL_DisplayMode mode;
I_ResetInvalidDisplayIndex();
if (SDL_GetCurrentDisplayMode(video_display, &mode)) if (SDL_GetCurrentDisplayMode(video_display, &mode))
{ {
I_Error("Error getting display mode: %s", SDL_GetError()); I_Error("Error getting display mode: %s", SDL_GetError());
@ -1387,7 +1388,6 @@ static void I_InitVideoParms(void)
// SDL may report native refresh rate as zero. // SDL may report native refresh rate as zero.
native_refresh_rate = mode.refresh_rate; native_refresh_rate = mode.refresh_rate;
I_ResetInvalidDisplayIndex();
widescreen = default_widescreen; widescreen = default_widescreen;
uncapped = default_uncapped; uncapped = default_uncapped;
grabmouse = default_grabmouse; grabmouse = default_grabmouse;