mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-15 06:53:22 +01:00
parent cd9f567fc2
commit b2fa47ef43
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
menu/menu_content.c
View File

@ -99,11 +99,7 @@ static bool menu_content_load(void)
fill_pathname_base(name, fullpath, sizeof(name)); fill_pathname_base(name, fullpath, sizeof(name));
if (!(content_load(0, NULL, NULL, menu_content_environment_get))) if (!(content_load(0, NULL, NULL, menu_content_environment_get)))
{ goto error;
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
runloop_msg_queue_push(msg, 1, 90, false);
return false;
}
if (*fullpath) if (*fullpath)
{ {
@ -111,7 +107,8 @@ static bool menu_content_load(void)
runloop_msg_queue_push(msg, 1, 1, false); runloop_msg_queue_push(msg, 1, 1, false);
} }
if (*fullpath || menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL)) if (*fullpath ||
menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
{ {
struct retro_system_info *info = NULL; struct retro_system_info *info = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
@ -121,6 +118,11 @@ static bool menu_content_load(void)
} }
return true; return true;
error:
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
runloop_msg_queue_push(msg, 1, 90, false);
return false;
} }
/** /**
@ -166,7 +168,9 @@ static bool menu_content_load_from_playlist(void *data)
else if (strstr(path_tolower, ".7z")) else if (strstr(path_tolower, ".7z"))
strstr(path_tolower, ".7z")[3] = '\0'; strstr(path_tolower, ".7z")[3] = '\0';
path_check = (char *)calloc(strlen(path_tolower) + 1, sizeof(char)); path_check = (char *)
calloc(strlen(path_tolower) + 1, sizeof(char));
strncpy(path_check, path, strlen(path_tolower)); strncpy(path_check, path, strlen(path_tolower));
free(path_tolower); free(path_tolower);
@ -176,10 +180,7 @@ static bool menu_content_load_from_playlist(void *data)
free(path_check); free(path_check);
if (!fp) if (!fp)
{ goto error;
runloop_msg_queue_push("File could not be loaded.\n", 1, 100, true);
return false;
}
retro_fclose(fp); retro_fclose(fp);
} }
@ -197,6 +198,10 @@ static bool menu_content_load_from_playlist(void *data)
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL);
return true; return true;
error:
runloop_msg_queue_push("File could not be loaded.\n", 1, 100, true);
return false;
} }
/** /**
@ -227,7 +232,8 @@ static bool menu_content_find_first_core(void *data)
uint32_t menu_label_hash = uint32_t menu_label_hash =
menu_hash_calculate(def_info->menu_label); menu_hash_calculate(def_info->menu_label);
if (!string_is_empty(def_info->dir) && !string_is_empty(def_info->path)) if ( !string_is_empty(def_info->dir)
&& !string_is_empty(def_info->path))
fill_pathname_join(def_info->s, fill_pathname_join(def_info->s,
def_info->dir, def_info->path, def_info->len); def_info->dir, def_info->path, def_info->len);