From 3990254a7c61292065c8547ad3f0056d551ab73f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 4 Feb 2020 05:54:00 +0100
Subject: [PATCH] Cleanups

---
 configuration.c | 32 ++++++++++++++------------------
 retroarch.c     | 24 ++++++++++++------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/configuration.c b/configuration.c
index c1c30db7ed..18535947c2 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2440,6 +2440,20 @@ void config_set_defaults(void *data)
 #endif
 }
 
+/**
+ * config_load:
+ *
+ * Loads a config file and reads all the values into memory.
+ *
+ */
+void config_load(void *data)
+{
+   global_t *global = (global_t*)data;
+   config_set_defaults(global);
+#ifdef HAVE_CONFIGFILE
+   config_parse_file(global);
+#endif
+}
 
 #ifdef HAVE_CONFIGFILE
 
@@ -3602,24 +3616,6 @@ void config_parse_file(void *data)
       }
    }
 }
-#endif
-
-/**
- * config_load:
- *
- * Loads a config file and reads all the values into memory.
- *
- */
-void config_load(void *data)
-{
-   global_t *global = (global_t*)data;
-   config_set_defaults(global);
-#ifdef HAVE_CONFIGFILE
-   config_parse_file(global);
-#endif
-}
-
-#ifdef HAVE_CONFIGFILE
 /**
  * config_save_autoconf_profile:
  * @path            : Path that shall be written to.
diff --git a/retroarch.c b/retroarch.c
index fa55b386b3..86e924647d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -24671,11 +24671,10 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
             case 'c':
                path_set(RARCH_PATH_CONFIG, optarg);
                break;
-#endif
-
             case RA_OPT_APPENDCONFIG:
                path_set(RARCH_PATH_CONFIG_APPEND, optarg);
                break;
+#endif
 
             case 's':
                strlcpy(global->name.savefile, optarg,
@@ -24873,19 +24872,18 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
                break;
    #endif
             case 'P':
+               strlcpy(bsv_movie_state.movie_start_path, optarg,
+                     sizeof(bsv_movie_state.movie_start_path));
+
+               bsv_movie_state.movie_start_playback  = true;
+               bsv_movie_state.movie_start_recording = false;
+               break;
             case 'R':
                strlcpy(bsv_movie_state.movie_start_path, optarg,
                      sizeof(bsv_movie_state.movie_start_path));
 
-               if (c == 'P')
-                  bsv_movie_state.movie_start_playback = true;
-               else
-                  bsv_movie_state.movie_start_playback = false;
-
-               if (c == 'R')
-                  bsv_movie_state.movie_start_recording = true;
-               else
-                  bsv_movie_state.movie_start_recording = false;
+               bsv_movie_state.movie_start_playback  = false;
+               bsv_movie_state.movie_start_recording = true;
                break;
 
             case 'M':
@@ -25074,9 +25072,11 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
                rarch_log_file_set_override(optarg);
                break;
 
-            case 'c':
             case 'h':
+#ifdef HAVE_CONFIGFILE
+            case 'c':
             case RA_OPT_APPENDCONFIG:
+#endif
             case 's':
             case 'S':
                break; /* Handled in the first pass */