frontend, fix scaling option handling

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 04e26bf..3377d40 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1214,7 +1214,7 @@ void emu_cmn_forced_frame(int no_scale, int do_emu)
 \r
        PicoIn.opt &= ~POPT_ALT_RENDERER;\r
        PicoIn.opt |= POPT_ACC_SPRITES;\r
-       if (!no_scale)\r
+       if (!no_scale && currentConfig.scaling)\r
                PicoIn.opt |= POPT_EN_SOFTSCALE;\r
 \r
        PicoDrawSetOutFormat(PDF_RGB555, 1);\r

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index fcf2712..c5478f4 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -294,7 +294,7 @@ void pemu_forced_frame(int no_scale, int do_emu)
 
        PicoIn.opt &= ~0x10;
        PicoIn.opt |= POPT_ACC_SPRITES;
-       if (!no_scale)
+       if (!no_scale && currentConfig.scaling)
                PicoIn.opt |= POPT_EN_SOFTSCALE;
        currentConfig.EmuOpt |= 0x80;
 

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 917ecc8..e138ce8 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -691,7 +691,7 @@ void pemu_forced_frame(int no_scale, int do_emu)
 
        PicoIn.opt &= ~POPT_ALT_RENDERER;
        PicoIn.opt |= POPT_ACC_SPRITES;
-       if (!no_scale)
+       if (!no_scale && defaultConfig.scaling)
                PicoIn.opt |= POPT_EN_SOFTSCALE;
        currentConfig.EmuOpt |= 0x80;