ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_driver.c) 

* Fix issue 14190
* Simplify code by removing unneeded code
This commit is contained in:
libretroadmin 2022-07-22 02:13:18 +02:00
parent 1f244aac01
commit 6cfcd749e4
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
menu/menu_driver.c
View File

@ -3751,6 +3751,7 @@ bool menu_shader_manager_save_preset_internal(
{ {
char fullname[PATH_MAX_LENGTH]; char fullname[PATH_MAX_LENGTH];
char buffer[PATH_MAX_LENGTH]; char buffer[PATH_MAX_LENGTH];
const char *preset_ext = NULL;
bool ret = false; bool ret = false;
enum rarch_shader_type type = RARCH_SHADER_NONE; enum rarch_shader_type type = RARCH_SHADER_NONE;
char *preset_path = NULL; char *preset_path = NULL;
@ -3764,48 +3765,23 @@ bool menu_shader_manager_save_preset_internal(
if ((type = menu_shader_manager_get_type(shader)) == RARCH_SHADER_NONE) if ((type = menu_shader_manager_get_type(shader)) == RARCH_SHADER_NONE)
return false; return false;
preset_ext = video_shader_get_preset_extension(type);
if (!string_is_empty(basename)) if (!string_is_empty(basename))
{ {
/* We are comparing against a fixed list of file
* extensions, the longest (slangp) being 6 characters
* in length. We therefore only need to extract the first
* 7 characters from the extension of the input path
* to correctly validate a match */
const char *ext = NULL;
strlcpy(fullname, basename, sizeof(fullname)); strlcpy(fullname, basename, sizeof(fullname));
/* Get file extension */
ext = strrchr(basename, '.');
/* Copy and convert to lower case */
if (ext && (*(++ext) != '\0'))
{
char ext_lower[8];
strlcpy(ext_lower, ext, sizeof(ext_lower));
string_to_lower(ext_lower);
/* Append extension automatically as appropriate. */
if ( !string_is_equal(ext_lower, "cgp")
&& !string_is_equal(ext_lower, "glslp")
&& !string_is_equal(ext_lower, "slangp"))
{
const char *preset_ext = video_shader_get_preset_extension(type);
strlcat(fullname, preset_ext, sizeof(fullname)); strlcat(fullname, preset_ext, sizeof(fullname));
} }
}
}
else else
snprintf(fullname, sizeof(fullname), "retroarch%s", snprintf(fullname, sizeof(fullname), "retroarch%s",
video_shader_get_preset_extension(type)); preset_ext);
if (path_is_absolute(fullname)) if (path_is_absolute(fullname))
{ {
preset_path = fullname; preset_path = fullname;
ret = video_shader_write_preset(preset_path, if ((ret = video_shader_write_preset(preset_path,
dir_video_shader, dir_video_shader,
shader, save_reference); shader, save_reference)))
if (ret)
RARCH_LOG("[Shaders]: Saved shader preset to \"%s\".\n", preset_path); RARCH_LOG("[Shaders]: Saved shader preset to \"%s\".\n", preset_path);
else else
RARCH_ERR("[Shaders]: Failed writing shader preset to \"%s\".\n", preset_path); RARCH_ERR("[Shaders]: Failed writing shader preset to \"%s\".\n", preset_path);