ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix --appendconfig conflict with load order 

I'd previously changed the load order of command line options to make
overrides work with less hassle. I didn't notice --appendconfig, which,
as a where-is-the-config-file option, needs to come before config file
loading. This fixes that.
This commit is contained in:
Gregor Richards 2018-03-20 18:48:51 -04:00
parent 813c7ad1f7
commit ea85727b3c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroarch.c
View File

@ -725,6 +725,10 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
path_set(RARCH_PATH_CONFIG, optarg); path_set(RARCH_PATH_CONFIG, optarg);
break; break;
case RA_OPT_APPENDCONFIG:
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
break;
case 's': case 's':
strlcpy(global->name.savefile, optarg, strlcpy(global->name.savefile, optarg,
sizeof(global->name.savefile)); sizeof(global->name.savefile));
@ -1022,10 +1026,6 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
} }
break; break;
case RA_OPT_APPENDCONFIG:
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
break;
case RA_OPT_SIZE: case RA_OPT_SIZE:
if (sscanf(optarg, "%ux%u", if (sscanf(optarg, "%ux%u",
recording_driver_get_width(), recording_driver_get_width(),
@ -1070,6 +1070,7 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
case 'c': case 'c':
case 'h': case 'h':
case RA_OPT_APPENDCONFIG:
case 's': case 's':
case 'S': case 'S':
break; /* Handled in the first pass */ break; /* Handled in the first pass */