From 0a1518684006294fca3cb72a6c56483650c4702f Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 5 Apr 2011 01:10:01 +0300
Subject: frontend: make -psxout cmd arg override config

---
 frontend/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'frontend')

diff --git a/frontend/main.c b/frontend/main.c
index 1030a32..adf5e31 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;
@@ -293,7 +294,10 @@ int main(int argc, char *argv[])
 	in_init();
 	//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
-- 
cgit v1.2.3