X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=f78d3d26c51b2204f9044264fa3d4fb4811cf963;hb=db57cbb83e573e115ca60f3855b28c264cf2159a;hp=3a772d0e887fb06a31a8f04bd01154ac2e020b75;hpb=8c84ba5f4478dd4e7cc48e86f1b023bc6b99ea9c;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index 3a772d0e..f78d3d26 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -2011,9 +2011,6 @@ static int reset_game(void)
 	ClosePlugins();
 	OpenPlugins();
 	SysReset();
-	if (CheckCdrom() != -1) {
-		LoadCdrom();
-	}
 	return 0;
 }
 
@@ -2042,13 +2039,17 @@ static int reload_plugins(const char *cdimg)
 
 static int run_bios(void)
 {
+	boolean origSlowBoot = Config.SlowBoot;
+
 	if (bios_sel == 0)
 		return -1;
 
 	ready_to_go = 0;
 	if (reload_plugins(NULL) != 0)
 		return -1;
+	Config.SlowBoot = 1;
 	SysReset();
+	Config.SlowBoot = origSlowBoot;
 
 	ready_to_go = 1;
 	return 0;
@@ -2652,10 +2653,11 @@ void menu_prepare_emu(void)
 	psxCpu = &psxInt;
 	#endif
 	if (psxCpu != prev_cpu) {
+		prev_cpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, NULL);
 		prev_cpu->Shutdown();
 		psxCpu->Init();
-		// note that this does not really reset, just clears drc caches
 		psxCpu->Reset();
+		psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
 	}
 
 	menu_sync_config();