diff --git a/command.c b/command.c index e9a5eea15f..3b24591ca7 100644 --- a/command.c +++ b/command.c @@ -1393,17 +1393,16 @@ static void command_event_disable_overrides(void) static void command_event_restore_default_shader_preset(void) { - /* auto shader preset: reload the original shader */ - - char *preset = NULL; - - if (path_get_default_shader_preset(&preset) && !string_is_empty(preset)) + if (!path_is_empty(RARCH_PATH_DEFAULT_SHADER_PRESET)) { + /* auto shader preset: reload the original shader */ settings_t *settings = config_get_ptr(); RARCH_LOG("Shaders: restoring default shader preset to %s\n", - preset); - strlcpy(settings->path.shader, preset, sizeof(settings->path.shader)); + path_get(RARCH_PATH_DEFAULT_SHADER_PRESET)); + strlcpy(settings->path.shader, + path_get(RARCH_PATH_DEFAULT_SHADER_PRESET), + sizeof(settings->path.shader)); } path_clear(RARCH_PATH_DEFAULT_SHADER_PRESET); diff --git a/paths.c b/paths.c index 42c200320f..b63fd664a3 100644 --- a/paths.c +++ b/paths.c @@ -634,14 +634,6 @@ bool path_is_empty(enum rarch_path_type type) return false; } -bool path_get_default_shader_preset(char **preset) -{ - if (!preset) - return false; - *preset = (char*)path_default_shader_preset; - return true; -} - void path_clear(enum rarch_path_type type) { switch (type) diff --git a/paths.h b/paths.h index 3b018ff390..21d4c5b0c5 100644 --- a/paths.h +++ b/paths.h @@ -82,8 +82,6 @@ const char *path_get(enum rarch_path_type type); const char *path_get_current_savefile_dir(void); -bool path_get_default_shader_preset(char **preset); - /* clear functions */ void path_clear(enum rarch_path_type type);