X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=b127077add0d4bcf68a8b4e7f30298b48d9ce418;hb=ce07c136bb10124ebb2029d5275e27ca2a6254af;hp=0f04bc4144711db26e51033db9de8a4123422ff3;hpb=274fcc35aa20e9777a8e09630a94088757384329;p=picodrive.git

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 0f04bc4..b127077 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -119,11 +119,14 @@ static void menu_enter(int is_rom_loaded)
 	}
 	else
 	{
+		int pos;
 		char buff[256];
+		pos = plat_get_skin_dir(buff, 256);
+		strcpy(buff + pos, "background.png");
 
 		// should really only happen once, on startup..
-		emu_make_path(buff, "skin/background.png", sizeof(buff));
-		if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0)
+		if (readpng(g_menubg_ptr, buff, READPNG_BG,
+						g_menuscreen_w, g_menuscreen_h) < 0)
 			memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
 	}
 
@@ -411,7 +414,7 @@ static menu_entry e_menu_cd_options[] =
 	mee_onoff_h("CDDA audio",           MA_CDOPT_CDDA,          PicoOpt, POPT_EN_MCD_CDDA, h_cdda),
 	mee_onoff_h("PCM audio",            MA_CDOPT_PCM,           PicoOpt, POPT_EN_MCD_PCM, h_cdpcm),
 	mee_onoff_h("SaveRAM cart",         MA_CDOPT_SAVERAM,       PicoOpt, POPT_EN_MCD_RAMCART, h_srcart),
-	mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
+	mee_onoff_h("Scale/Rot. fx",        MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
 	mee_end,
 };
 
@@ -1019,6 +1022,8 @@ static int main_menu_handler(int id, int keys)
 		break;
 	case MA_MAIN_CHANGE_CD:
 		if (PicoAHW & PAHW_MCD) {
+			// if cd is loaded, cdd_unload() triggers eject and
+			// returns 1, else we'll select and load new CD here
 			if (!cdd_unload())
 				menu_loop_tray();
 			return 1;