Simplify setting_find_setting

This commit is contained in:
twinaphex 2015-06-06 19:32:51 +02:00
parent ccc19dd691
commit dff082cd67

View File

@ -308,8 +308,6 @@ static rarch_setting_t *menu_setting_get_ptr(void)
static rarch_setting_t* setting_find_setting( static rarch_setting_t* setting_find_setting(
rarch_setting_t* settings, const char* name) rarch_setting_t* settings, const char* name)
{ {
bool found = false;
if (!settings || !name) if (!settings || !name)
return NULL; return NULL;
@ -317,21 +315,18 @@ static rarch_setting_t* setting_find_setting(
{ {
if (settings->type <= ST_GROUP && !strcmp(settings->name, name)) if (settings->type <= ST_GROUP && !strcmp(settings->name, name))
{ {
found = true; if (settings->short_description && settings->short_description[0] == '\0')
break; return NULL;
if (settings->read_handler)
settings->read_handler(settings);
return settings;
} }
} }
if (!found) return NULL;
return NULL;
if (settings->short_description && settings->short_description[0] == '\0')
return NULL;
if (settings->read_handler)
settings->read_handler(settings);
return settings;
} }
rarch_setting_t *menu_setting_find(const char *label) rarch_setting_t *menu_setting_find(const char *label)