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

Cleanups

This commit is contained in:
twinaphex 2016-12-14 16:33:54 +01:00
parent a73c5327b1
commit 15780e7a87
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
menu/cbs/menu_cbs_ok.c
View File

@ -2324,27 +2324,28 @@ static void cb_generic_download(void *task_data,
case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG: case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG:
case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL: case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL:
case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG: case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG:
{ {
static char shaderdir[PATH_MAX_LENGTH] = {0}; static char shaderdir[PATH_MAX_LENGTH] = {0};
const char *dirname = NULL; const char *dirname = NULL;
if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG)
dirname = "shaders_cg";
else if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL)
dirname = "shaders_glsl";
else if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG)
dirname = "shaders_slang";
fill_pathname_join(shaderdir, if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG)
settings->directory.video_shader, dirname = "shaders_cg";
dirname, else if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL)
sizeof(shaderdir)); dirname = "shaders_glsl";
if (!path_file_exists(shaderdir)) else if (transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG)
if (!path_mkdir(shaderdir)) dirname = "shaders_slang";
fill_pathname_join(shaderdir,
settings->directory.video_shader,
dirname,
sizeof(shaderdir));
if (!path_file_exists(shaderdir) && !path_mkdir(shaderdir))
goto finish; goto finish;
dir_path = shaderdir; dir_path = shaderdir;
}
break; break;
}
case MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD: case MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD:
dir_path = LAKKA_UPDATE_DIR; dir_path = LAKKA_UPDATE_DIR;
break; break;
@ -3654,16 +3655,19 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
{ {
unsigned first_char = 0; unsigned first_char = 0;
const char *str = msg_hash_to_str(cbs->enum_idx); const char *str = msg_hash_to_str(cbs->enum_idx);
if (!str) if (!str)
continue; continue;
if (!strstr(str, "input_binds_list")) if (!strstr(str, "input_binds_list"))
continue; continue;
first_char = atoi(&str[0]); first_char = atoi(&str[0]);
if (first_char == (i+1))
{ if (first_char != (i+1))
BIND_ACTION_OK(cbs, action_ok_push_user_binds_list); continue;
return 0;
} BIND_ACTION_OK(cbs, action_ok_push_user_binds_list);
return 0;
} }
} }