From 45a37211e478459a7735903084f9edb423157601 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Sun, 23 Jul 2017 10:49:13 -0400
Subject: [PATCH] - added special handling for vid_scalemode == [1||2] to force
 video aspect scaling off unless the user explicitly specified an aspect
 override.

---
 src/v_video.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/v_video.cpp b/src/v_video.cpp
index 028973aac..24fbab68f 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -1604,6 +1604,7 @@ CUSTOM_CVAR (Bool, vid_nowidescreen, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)
 	}
 }
 
+EXTERN_CVAR (Int, vid_scalemode)
 CUSTOM_CVAR (Int, vid_aspect, 0, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)
 {
 	setsizeneeded = true;
@@ -1630,6 +1631,10 @@ int ActiveFakeRatio(int width, int height)
 			fakeratio = 3;
 		}
 	}
+	else if (vid_aspect == 0 && (vid_scalemode == 1 || vid_scalemode == 2))
+	{
+		fakeratio = 0;
+	}
 	if (vid_nowidescreen)
 	{
 		if (!vid_tft)