X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=adf5e31f1a4fe0d10863b788028356de96841d91;hp=0ed66d5dd6eef94784f20ff841c0b1424599ff77;hb=6c9a982ac534aef9b19b9e7d9033516a0f13485a;hpb=29a8c4f3e7fee7678e4b18de1748b9c4255dcef2

diff --git a/frontend/main.c b/frontend/main.c
index 0ed66d5d..adf5e31f 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -225,12 +225,13 @@ int main(int argc, char *argv[])
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
 	const char *cdfile = NULL;
+	int psxout = 0;
 	int loadst = 0;
 	int i;
 
 	// read command line options
 	for (i = 1; i < argc; i++) {
-		     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
+		     if (!strcmp(argv[i], "-psxout")) psxout = 1;
 		else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]);
 		else if (!strcmp(argv[i], "-cfg")) {
 			if (i+1 >= argc) break;
@@ -291,9 +292,12 @@ int main(int argc, char *argv[])
 
 	// frontend stuff
 	in_init();
-	in_probe();
+	//in_probe();
 	plat_init();
-	menu_init();
+	menu_init(); // loads config
+
+	if (psxout)
+		Config.PsxOut = 1;
 
 	if (LoadPlugins() == -1) {
 		// FIXME: this recovery doesn't work, just delete bad config and bail out