From ea85727b3cd09cc81ad3a749436f6888f056c77b Mon Sep 17 00:00:00 2001
From: Gregor Richards <hg-yff@gregor.im>
Date: Tue, 20 Mar 2018 18:48:51 -0400
Subject: [PATCH] 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.
---
 retroarch.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 7d64139dd7..3148d556bf 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -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 */