cleanup task_content.c too

This commit is contained in:
radius 2018-12-10 23:27:04 -05:00
parent 7a36190a0e
commit 479104ee05

View File

@ -1781,12 +1781,18 @@ int content_get_subsystem()
void content_set_subsystem(unsigned idx) void content_set_subsystem(unsigned idx)
{ {
rarch_system_info_t *system = runloop_get_system_info(); rarch_system_info_t *system = runloop_get_system_info();
const struct retro_subsystem_info *subsystem = system ? const struct retro_subsystem_info *subsystem;
subsystem_data + idx : NULL;
pending_subsystem_id = idx; /* Core fully loaded, use the subsystem data */
if (system->subsystem.data)
subsystem = system->subsystem.data + idx;
/* Core not loaded completely, use the data we peeked on load core */
else
subsystem = subsystem_data + idx;
if (subsystem_current_count > 0) pending_subsystem_id = idx;
if (subsystem && subsystem_current_count > 0)
{ {
strlcpy(pending_subsystem_ident, strlcpy(pending_subsystem_ident,
subsystem->ident, sizeof(pending_subsystem_ident)); subsystem->ident, sizeof(pending_subsystem_ident));