From: Toni Wilen <twilen@winuae.net>
Date: Sat, 2 Dec 2023 17:54:29 +0000 (+0200)
Subject: Do not scale programmed modes if scale mode is default or TV
X-Git-Tag: 5.1.0~31
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=bc5de01391d65a54563844f3959bd1855123163b;p=francis%2Fwinuae.git

Do not scale programmed modes if scale mode is default or TV
---

diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index e331f3f6..90fb74ee 100644
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -360,6 +360,13 @@ void getfilterrect2(int monid, RECT *sr, RECT *dr, RECT *zr, int dst_width, int
 		if (scalemode == AUTOSCALE_STATIC_MAX || scalemode == AUTOSCALE_STATIC_NOMINAL ||
 			scalemode == AUTOSCALE_INTEGER || scalemode == AUTOSCALE_INTEGER_AUTOSCALE) {
 
+			if (scalemode == AUTOSCALE_STATIC_NOMINAL || scalemode == AUTOSCALE_STATIC_NOMINAL || scalemode == AUTOSCALE_STATIC_MAX) {
+				// do not default/TV scale programmed modes
+				if (beamcon0 & BEAMCON0_VARBEAMEN) {
+					goto cont;
+				}
+			}
+
 			if (specialmode) {
 				cx = 0;
 				cy = 0;
@@ -371,7 +378,7 @@ void getfilterrect2(int monid, RECT *sr, RECT *dr, RECT *zr, int dst_width, int
 				cw = avidinfo->drawbuffer.inwidth;
 				ch = avidinfo->drawbuffer.inheight;
 				cv = 1;
-				if (!(beamcon0 & BEAMCON0_VARBEAMEN) && (scalemode == AUTOSCALE_STATIC_NOMINAL)) { // || scalemode == AUTOSCALE_INTEGER)) {
+				if (scalemode == AUTOSCALE_STATIC_NOMINAL) { // || scalemode == AUTOSCALE_INTEGER)) {
 					cx = 28 << currprefs.gfx_resolution;
 					cy = 10 << currprefs.gfx_vresolution;
 					cw -= 40 << currprefs.gfx_resolution;