X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=507437af4fe0b6eb7b0ce6b6e0411bf75f401270;hb=35cbf2ec89d87204288d4d40ad46bf77361e5cfe;hp=627c3be285356dcf5d305a83bae0020c47ace5d2;hpb=9efc102f1c8f6e2ebc5412f1b2c45a0c77acad48;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 627c3be..507437a 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -514,6 +514,9 @@ int emu_reload_rom(char *rom_fname)
 
 	shutdown_MCD();
 	PicoPatchUnload();
+	PicoCartUnload();
+	rom_loaded = 0;
+
 	PicoAHW = 0;
 
 	if (media_type == PM_CD)
@@ -558,9 +561,6 @@ int emu_reload_rom(char *rom_fname)
 
 	menu_romload_prepare(used_rom_name); // also CD load
 
-	PicoCartUnload();
-	rom_loaded = 0;
-
 	ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
 	pm_close(rom);
 	if (ret != 0) {
@@ -1373,6 +1373,7 @@ void emu_loop(void)
 	// prepare CD buffer
 	if (PicoAHW & PAHW_MCD)
 		PicoCDBufferInit();
+	PicoLoopPrepare();
 
 	pemu_loop_prep();