mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-01-19 22:52:31 +01:00
parent b2426f30a6
commit 748959c8fc
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
content.c
View File

@ -701,9 +701,6 @@ static bool init_content_file_set_attribs(
* Initializes and loads a content file for the currently
* selected libretro core.
*
* global->content_is_init will be set to the return value
* on exit.
*
* Returns : true if successful, otherwise false.
**/
static bool content_init_file(struct string_list *temporary_content)
@ -717,8 +714,6 @@ static bool content_init_file(struct string_list *temporary_content)
rarch_system_info_t *system = NULL;
global_t *global = global_get_ptr();
global->inited.content = false;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (*global->subsystem)
@ -748,19 +743,10 @@ static bool content_init_file(struct string_list *temporary_content)
if (info)
free(info);
if (!ret)
goto error;
global->inited.content = true;
if (content)
string_list_free(content);
return true;
error:
if (content)
string_list_free(content);
return false;
return ret;
}
bool content_ctl(enum content_ctl_state state, void *data)
@ -785,9 +771,16 @@ bool content_ctl(enum content_ctl_state state, void *data)
return content_save_state(path);
}
case CONTENT_CTL_INIT:
if (content_init_file(temporary_content))
return true;
/* fall-through */
{
global_t *global = global_get_ptr();
if (content_init_file(temporary_content))
{
global->inited.content = true;
return true;
}
global->inited.content = false;
/* fall-through */
}
case CONTENT_CTL_TEMPORARY_FREE:
if (!temporary_content)
return false;

5
content.h
View File

@ -32,10 +32,7 @@ enum content_ctl_state
CONTENT_CTL_NONE = 0,
/* Initializes and loads a content file for the currently
* selected libretro core.
*
* global->content_is_init will be set to the return value
* on exit. */
* selected libretro core. */
CONTENT_CTL_INIT,
/* Load a state from disk to memory. */