aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authornotaz2011-04-05 01:10:01 +0300
committernotaz2011-04-05 01:10:01 +0300
commit0a1518684006294fca3cb72a6c56483650c4702f (patch)
tree818193a7276f85060e330851214674b686868b85 /frontend
parent4215cb1fa3c1f545b2bac62c5fc4c478469a6a46 (diff)
downloadpcsx_rearmed-0a1518684006294fca3cb72a6c56483650c4702f.tar.gz
pcsx_rearmed-0a1518684006294fca3cb72a6c56483650c4702f.tar.bz2
pcsx_rearmed-0a1518684006294fca3cb72a6c56483650c4702f.zip
frontend: make -psxout cmd arg override config
Diffstat (limited to 'frontend')
-rw-r--r--frontend/main.c8
1 files changed, 6 insertions, 2 deletions
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