From 0ba8b2030529cf892ab136c0a067cc20e3e58d30 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Mon, 28 Sep 2009 11:57:16 +0000 Subject: [PATCH] * Avoid calculating a NaN when failing to compute the display aspect ratio --- code/sdl/sdl_glimp.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index 82f6e22d..2ed73ead 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -239,12 +239,20 @@ static int GLimp_SetMode( int mode, qboolean fullscreen ) sVideoInfo.vfmt = &sPixelFormat; videoInfo = &sVideoInfo; - // Guess the display aspect ratio through the desktop resolution - // by assuming (relatively safely) that it is set at or close to - // the display's native aspect ratio - displayAspect = (float)videoInfo->current_w / (float)videoInfo->current_h; + if( videoInfo->current_h > 0 ) + { + // Guess the display aspect ratio through the desktop resolution + // by assuming (relatively safely) that it is set at or close to + // the display's native aspect ratio + displayAspect = (float)videoInfo->current_w / (float)videoInfo->current_h; - ri.Printf( PRINT_ALL, "Estimated display aspect: %.3f\n", displayAspect ); + ri.Printf( PRINT_ALL, "Estimated display aspect: %.3f\n", displayAspect ); + } + else + { + ri.Printf( PRINT_ALL, + "Cannot estimate display aspect, assuming 1.333f\n" ); + } } #endif