Create dir_is_empty

This commit is contained in:
twinaphex 2016-09-30 07:06:27 +02:00
parent d7d49c36c7
commit fa469c4dcc
3 changed files with 19 additions and 25 deletions

32
dirs.c
View File

@ -168,24 +168,24 @@ void dir_check_shader(bool pressed_next, bool pressed_prev)
/* empty functions */
bool dir_is_system_empty(void)
bool dir_is_empty(enum rarch_dir_type type)
{
return string_is_empty(dir_savefile);
}
switch (type)
{
case RARCH_DIR_SYSTEM:
return string_is_empty(dir_system);
case RARCH_DIR_SAVEFILE:
return string_is_empty(dir_savefile);
case RARCH_DIR_SAVESTATE:
return string_is_empty(dir_savestate);
case RARCH_DIR_OSK_OVERLAY:
return string_is_empty(dir_osk_overlay);
case RARCH_DIR_NONE:
default:
break;
}
bool dir_is_savefile_empty(void)
{
return string_is_empty(dir_savefile);
}
bool dir_is_savestate_empty(void)
{
return string_is_empty(dir_savestate);
}
bool dir_is_osk_overlay_empty(void)
{
return string_is_empty(dir_osk_overlay);
return false;
}
/* get size functions */

8
dirs.h
View File

@ -44,13 +44,7 @@ void dir_check_shader(bool pressed_next, bool pressed_prev);
/* empty functions */
bool dir_is_savefile_empty(void);
bool dir_is_savestate_empty(void);
bool dir_is_system_empty(void);
bool dir_is_osk_overlay_empty(void);
bool dir_is_empty(enum rarch_dir_type type);
/* clear functions */

View File

@ -847,9 +847,9 @@ static void menu_content_environment_get(int *argc, char *argv[],
if (!path_is_empty(RARCH_PATH_CONFIG))
wrap_args->config_path = path_get(RARCH_PATH_CONFIG);
if (!dir_is_savefile_empty())
if (!dir_is_empty(RARCH_DIR_SAVEFILE))
wrap_args->sram_path = dir_get_savefile();
if (!dir_is_savestate_empty())
if (!dir_is_empty(RARCH_DIR_SAVESTATE))
wrap_args->state_path = dir_get_savestate();
if (fullpath && *fullpath)
wrap_args->content_path = fullpath;