X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=37c9ba32969ef78951c7b5d4d2cfa786cbb57029;hp=7b459832690d1f34d0d799cf79743cd3eff196db;hb=6fe1f05632f22ddba1d19814e2b14454e8e51940;hpb=c5061935e3f7b91d889d7546b06c4515c3004cb2

diff --git a/frontend/main.c b/frontend/main.c
index 7b459832..37c9ba32 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -16,6 +16,7 @@
 
 #include "main.h"
 #include "plugin.h"
+#include "plugin_lib.h"
 #include "pcnt.h"
 #include "menu.h"
 #include "../libpcsxcore/misc.h"
@@ -61,15 +62,16 @@ static void CheckSubDir() {
 
 void set_cd_image(const char *fname)
 {
-	const char *ext;
-	int len;
+	const char *ext = NULL;
 	
-	len = strlen(fname);
-	ext = fname;
-	if (len > 2)
-		ext = fname + len - 2;
+	if (fname != NULL) {
+		int len = strlen(fname);
+		ext = fname;
+		if (len > 2)
+			ext = fname + len - 2;
+	}
 
-	if (strcasecmp(ext, ".z") == 0) {
+	if (ext && strcasecmp(ext, ".z") == 0) {
 		SetIsoFile(NULL);
 		cdrcimg_set_fname(fname);
 		strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -79,6 +81,24 @@ void set_cd_image(const char *fname)
 	}
 }
 
+static void set_default_paths(void)
+{
+	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
+	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
+	strcpy(Config.BiosDir, "bios");
+
+	strcpy(Config.PluginsDir, "plugins");
+	strcpy(Config.Gpu, "builtin_gpu");
+	strcpy(Config.Spu, "builtin_spu");
+	strcpy(Config.Cdr, "builtin_cdr");
+	strcpy(Config.Pad1, "builtin_pad");
+	strcpy(Config.Pad2, "builtin_pad");
+	strcpy(Config.Net, "Disabled");
+	Config.PsxAuto = 1;
+
+	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
+}
+
 int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
@@ -162,31 +182,10 @@ int main(int argc, char *argv[])
 	}
 
 	memset(&Config, 0, sizeof(PcsxConfig));
-	strcpy(Config.Net, "Disabled");
 
 	CheckSubDir();
-
-	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
-	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
+	set_default_paths();
 	strcpy(Config.Bios, "HLE");
-	strcpy(Config.BiosDir, "./");
-
-	strcpy(Config.PluginsDir, "plugins");
-	strcpy(Config.Gpu, "builtin_gpu");
-	strcpy(Config.Spu, "builtin_spu");
-	strcpy(Config.Cdr, "builtin_cdr");
-	strcpy(Config.Pad1, "builtin_pad");
-	strcpy(Config.Pad2, "builtin_pad");
-	Config.PsxAuto = 1;
-
-	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
-/*
-	// switch to plugin dotdir
-	// this lets plugins work without modification!
-	gchar *plugin_default_dir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
-	chdir(plugin_default_dir);
-	g_free(plugin_default_dir);
-*/
 
 	if (cdfile)
 		set_cd_image(cdfile);
@@ -201,6 +200,11 @@ int main(int argc, char *argv[])
 	menu_init();
 
 	if (LoadPlugins() == -1) {
+		// FIXME: this recovery doesn't work, just delete bad config and bail out
+		// SysMessage("could not load plugins, retrying with defaults\n");
+		set_default_paths();
+		snprintf(path, sizeof(path), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+		remove(path);
 		SysMessage("Failed loading plugins!");
 		return 1;
 	}
@@ -242,6 +246,8 @@ int main(int argc, char *argv[])
 	else
 		menu_loop();
 
+	pl_start_watchdog();
+
 	while (1)
 	{
 		psxCpu->Execute();
@@ -274,11 +280,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() {