diff --git a/paths.c b/paths.c
index 8831959ae2..8e1e25a33f 100644
--- a/paths.c
+++ b/paths.c
@@ -502,9 +502,17 @@ void path_set_core(const char *path)
    strlcpy(path_libretro, path, sizeof(path_libretro));
 }
 
-void path_set_subsystem(const char *path)
+void path_set(enum rarch_path_type type, const char *path)
 {
-   strlcpy(subsystem_path, path, sizeof(subsystem_path));
+   switch (type)
+   {
+      case RARCH_PATH_SUBSYSTEM:
+         strlcpy(subsystem_path, path, sizeof(subsystem_path));
+         break;
+      default:
+      case RARCH_PATH_NONE:
+         break;
+   }
 }
 
 void path_clear_subsystem(void)
diff --git a/paths.h b/paths.h
index 6b66490561..393ba9b249 100644
--- a/paths.h
+++ b/paths.h
@@ -31,6 +31,12 @@ enum rarch_content_type
    RARCH_CONTENT_IMAGE
 };
 
+enum rarch_path_type
+{
+   RARCH_PATH_NONE = 0,
+   RARCH_PATH_SUBSYSTEM
+};
+
 void path_deinit_subsystem(void);
 
 void path_deinit_savefile(void);
@@ -43,7 +49,7 @@ void path_fill_names(void);
 
 /* set functions */
 
-void path_set_subsystem(const char *path);
+void path_set(enum rarch_path_type type, const char *path);
 
 void path_set_redirect(void);
 
diff --git a/retroarch.c b/retroarch.c
index 7d84b08b21..aa00193eb2 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -788,7 +788,7 @@ static void retroarch_parse_input(int argc, char *argv[])
             break;
 
          case RA_OPT_SUBSYSTEM:
-            path_set_subsystem(optarg);
+            path_set(RARCH_PATH_SUBSYSTEM, optarg);
             break;
 
          case RA_OPT_FEATURES: