From ed2b89db279b354bd0812ebb6567f11a27b72692 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 29 Sep 2016 08:34:08 +0200 Subject: [PATCH] Cleanups --- paths.c | 11 ++++------- paths.h | 2 -- runloop.c | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/paths.c b/paths.c index 2e7a3b11f9..6afb8d6532 100644 --- a/paths.c +++ b/paths.c @@ -482,6 +482,10 @@ const char *path_get(enum rarch_path_type type) { switch (type) { + case RARCH_PATH_CORE_OPTIONS: + if (!path_is_core_options_empty()) + return path_core_options_file; + break; case RARCH_PATH_SUBSYSTEM: return subsystem_path; case RARCH_PATH_CONFIG: @@ -625,13 +629,6 @@ void path_clear_core_options(void) -const char *path_get_core_options(void) -{ - if (!path_is_core_options_empty()) - return path_core_options_file; - - return NULL; -} /* Append config file path */ diff --git a/paths.h b/paths.h index 6cdd8a931a..a068dbb91b 100644 --- a/paths.h +++ b/paths.h @@ -88,8 +88,6 @@ const char *path_get_current_savefile_dir(void); const char *path_get_basename(void); -const char *path_get_core_options(void); - bool path_get_default_shader_preset(char **preset); /* clear functions */ diff --git a/runloop.c b/runloop.c index 4cd549e785..19b8f24ee2 100644 --- a/runloop.c +++ b/runloop.c @@ -971,7 +971,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) if(!path_is_core_options_empty()) { core_option_manager_flush_game_specific(runloop_core_options, - path_get_core_options()); + path_get(RARCH_PATH_CORE_OPTIONS)); path_clear_core_options(); } else