X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=52fa349765fd7fe9cf9a332e79b962736d4a38d9;hp=7b459832690d1f34d0d799cf79743cd3eff196db;hb=e6eb2066c0d198d793067caed47b670b691eb865;hpb=796a91ef98cca649bc62710491e2681b2ba8be1c

diff --git a/frontend/main.c b/frontend/main.c
index 7b459832..52fa3497 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
 	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
 	strcpy(Config.Bios, "HLE");
-	strcpy(Config.BiosDir, "./");
+	strcpy(Config.BiosDir, "bios");
 
 	strcpy(Config.PluginsDir, "plugins");
 	strcpy(Config.Gpu, "builtin_gpu");
@@ -274,11 +274,23 @@ void StartGui() {
         printf("StartGui\n");
 }
 
+static void dummy_lace()
+{
+}
+
 void SysReset() {
+	// rearmed hack: EmuReset() runs some code when real BIOS is used,
+	// but we usually do reset from menu while GPU is not open yet,
+	// so we need to prevent updateLace() call..
+	void *real_lace = GPU_updateLace;
+	GPU_updateLace = dummy_lace;
+
 	EmuReset();
 
 	// hmh core forgets this
 	CDR_stop();
+
+	GPU_updateLace = real_lace;
 }
 
 void SysClose() {