Use noext versions of fill_path* functions

This commit is contained in:
twinaphex 2016-06-28 13:13:36 +02:00
parent b593e73896
commit 099be6ed2d
2 changed files with 6 additions and 9 deletions

View File

@ -1451,16 +1451,16 @@ static bool command_event_save_core_config(void)
/* In case of collision, find an alternative name. */
for (i = 0; i < 16; i++)
{
char tmp[64];
char tmp[64] = {0};
fill_pathname_base(
fill_pathname_base_noext(
config_name,
settings->path.libretro,
sizeof(config_name));
path_remove_extension(config_name);
fill_pathname_join(config_path, config_dir, config_name,
sizeof(config_path));
if (i)
snprintf(tmp, sizeof(tmp), "-%u%s",
i,

View File

@ -60,19 +60,16 @@ void menu_shader_manager_init(menu_handle_t *menu)
* conflicts on menu.cgp/menu.glslp. */
if (config_path)
{
fill_pathname_base(menu->default_glslp, config_path,
fill_pathname_base_noext(menu->default_glslp, config_path,
sizeof(menu->default_glslp));
path_remove_extension(menu->default_glslp);
strlcat(menu->default_glslp, ".glslp", sizeof(menu->default_glslp));
fill_pathname_base(menu->default_cgp, config_path,
fill_pathname_base_noext(menu->default_cgp, config_path,
sizeof(menu->default_cgp));
path_remove_extension(menu->default_cgp);
strlcat(menu->default_cgp, ".cgp", sizeof(menu->default_cgp));
fill_pathname_base(menu->default_slangp, config_path,
fill_pathname_base_noext(menu->default_slangp, config_path,
sizeof(menu->default_slangp));
path_remove_extension(menu->default_slangp);
strlcat(menu->default_slangp, ".slangp", sizeof(menu->default_slangp));
}
else