X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmenu.c;h=5cedc8524601004606a0e1adfd344eb9e0fdfce5;hp=e4b3488e1c5abb4882451e0ba85289c1ac8b1404;hb=f5eb372f3bff0731642899f6aaec35e9001bd451;hpb=9b4514550544ca3d0a451ba0a08eeb502961ec1c

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index e4b3488..5cedc85 100644
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -1,7 +1,5 @@
+// menu system for gpfce - FCE Ultra port
 // (c) Copyright 2006,2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
 
 #include <stdio.h>
 #include <string.h>
@@ -1386,10 +1384,17 @@ static void menu_prepare_bg(void)
 	if (fceugi)
 	{
 		/* raw emu frame should now be at gp2x_screen */
-		soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline);
-		if (srendline)
-			memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4);
-		memcpy(menu_bg, gp2x_screen + 32, 320*240*2);
+		if (Settings.scaling != 0)
+		{
+			soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline);
+			if (srendline)
+				memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4);
+			memcpy(menu_bg, gp2x_screen + 32, 320*240*2);
+		}
+		else
+		{
+			convert2RGB555(menu_bg, gp2x_screen, gp2x_palette16, 320*240);
+		}
 	}
 	else
 	{