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

Merge pull request #6428 from GregorR/fix-appendconfig 

Fix --appendconfig conflict with load order
This commit is contained in:
Twinaphex 2018-03-21 05:29:22 +01:00 committed by GitHub
parent 4fa50d14ea ea85727b3c
commit c29ff4304c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
break;
case RA_OPT_APPENDCONFIG:
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
break;
case 's':
strlcpy(global->name.savefile, optarg,
sizeof(global->name.savefile));
@ -1022,10 +1026,6 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
}
break;
case RA_OPT_APPENDCONFIG:
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
break;
case RA_OPT_SIZE:
if (sscanf(optarg, "%ux%u",
recording_driver_get_width(),
@ -1070,6 +1070,7 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
case 'c':
case 'h':
case RA_OPT_APPENDCONFIG:
case 's':
case 'S':
break; /* Handled in the first pass */