VGA autoresolution integer scale fix

diff --git a/drawing.cpp b/drawing.cpp
index c3a8633c715d189252cefac246dc7718fc6fd86b..85c4e036f151e4d6bb977a291934049008b19a40 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -3206,7 +3206,11 @@ static void expand_bplcon1(uae_u16 v)
 
 int gethresolution(void)
 {
-       return hresolution;
+       int h = currprefs.gfx_resolution;
+       if (autoswitch_old_resolution == RES_HIRES && currprefs.gfx_resolution == RES_SUPERHIRES) {
+               h--;
+       }
+       return h;
 }
 
 static void sethresolution(void)

diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index 42efaa0b33b17c09a3d03d152daa2d57a13311eb..ae7b6abcc6ece3acc6c4176a63d469d1b02f91ff 100644 (file)
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -38,7 +38,6 @@ static bool getmanualpos(int monid, int *cxp, int *cyp, int *cwp, int *chp)
        struct vidbuf_description *avidinfo = &adisplays[monid].gfxvidinfo;
        int v, cx, cy, cw, ch;
        bool native = isnativevidbuf(monid);
-       int hres = gethresolution();
 
        cx = *cxp;
        cy = *cyp;
@@ -315,7 +314,7 @@ void getfilterdata(int monid, struct displayscale *ds)
 
        if (scalemode) {
                int cw, ch, cx, cy, cv = 0, crealh = 0;
-               int hres = currprefs.gfx_resolution;
+               int hres = gethresolution();
                int vres = currprefs.gfx_vresolution;
                static int oxmult, oymult;