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

Cleanup

This commit is contained in:
twinaphex 2016-12-20 22:35:59 +01:00
parent 336d825525
commit 3f1064d001
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/task_content.c
View File

@ -487,7 +487,7 @@ static bool content_file_init_extract(
#endif #endif
/** /**
* load_content: * content_file_load:
* @special : subsystem of content to be loaded. Can be NULL. * @special : subsystem of content to be loaded. Can be NULL.
* content : * content :
* *
@ -495,7 +495,7 @@ static bool content_file_init_extract(
* *
* Returns : true if successful, otherwise false. * Returns : true if successful, otherwise false.
**/ **/
static bool load_content( static bool content_file_load(
struct string_list *temporary_content, struct string_list *temporary_content,
struct retro_game_info *info, struct retro_game_info *info,
const struct string_list *content, const struct string_list *content,
@ -754,7 +754,7 @@ static bool content_file_init(struct string_list *temporary_content,
if (info) if (info)
{ {
unsigned i; unsigned i;
ret = load_content(temporary_content, info, content, special); ret = content_file_load(temporary_content, info, content, special);
for (i = 0; i < content->size; i++) for (i = 0; i < content->size; i++)
free((void*)info[i].data); free((void*)info[i].data);
@ -843,7 +843,14 @@ bool content_init(void)
end: end:
if (error_string) if (error_string)
{ {
RARCH_ERR("%s\n", error_string); if (ret)
{
RARCH_LOG("%s\n", error_string);
}
else
{
RARCH_ERR("%s\n", error_string);
}
runloop_msg_queue_push(error_string, 2, ret ? 1 : 180, true); runloop_msg_queue_push(error_string, 2, ret ? 1 : 180, true);
free(error_string); free(error_string);
} }