From d487b1a69f8961b9d4f8658c2e2ae3c272acd2cb Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sat, 18 Apr 2015 15:50:15 -0500
Subject: fix initialization based on r_width and r_height

let the cvars default to "0"; upon video startup, if any of these are non-positive, try to pick up the desktop's resolution, and update the cvars
---
 src/sdl/sdl_glimp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/sdl')

diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 69cdb374..51b448a2 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -261,9 +261,14 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
 
 	if( !failSafe )
 	{
-		// use desktop video resolution
-		if( desktopMode.h > 0 )
+		if( r_width->integer > 0 && r_height->integer > 0 )
 		{
+			glConfig.vidWidth = r_width->integer;
+			glConfig.vidHeight = r_height->integer;
+		}
+		else if( desktopMode.h > 0 )
+		{
+			// use desktop video resolution
 			glConfig.vidWidth = desktopMode.w;
 			glConfig.vidHeight = desktopMode.h;
 		}
-- 
cgit