CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 15:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups to setting_data_get_label

Browse Source
This commit is contained in:
twinaphex 2015-01-31 11:10:32 +01:00
parent cc5147e1c9
commit eb06611196
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database_info.c
View File

@ -45,10 +45,10 @@ int database_open_cursor(libretrodb_t *db,
database_info_list_t *database_info_list_new(const char *rdb_path, const char *query) database_info_list_t *database_info_list_new(const char *rdb_path, const char *query)
{ {
size_t i = 0, j;
libretrodb_t db; libretrodb_t db;
libretrodb_cursor_t cur; libretrodb_cursor_t cur;
struct rmsgpack_dom_value item; struct rmsgpack_dom_value item;
size_t i = 0, j;
database_info_t *database_info = NULL; database_info_t *database_info = NULL;
database_info_list_t *database_info_list = NULL; database_info_list_t *database_info_list = NULL;

22
settings_data.c
View File

@ -3027,8 +3027,6 @@ void setting_data_get_label(void *data, char *type_str,
menu_common_setting_set_label_perf(type_str, type_str_size, w, type, menu_common_setting_set_label_perf(type_str, type_str_size, w, type,
perf_counters_libretro, perf_counters_libretro,
type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN); type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN);
else if (setting)
setting_data_get_string_representation(setting, type_str, type_str_size);
else else
{ {
if (!driver.menu || !driver.menu->menu_list) if (!driver.menu || !driver.menu->menu_list)
@ -3039,19 +3037,19 @@ void setting_data_get_label(void *data, char *type_str,
setting = (rarch_setting_t*)setting_data_find_setting(setting_data, setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
driver.menu->menu_list->selection_buf->list[idx].label); driver.menu->menu_list->selection_buf->list[idx].label);
if (setting) if (!setting)
return;
if (!strcmp(setting->name, "configurations"))
{ {
if (!strcmp(setting->name, "configurations")) if (*g_extern.config_path)
{ fill_pathname_base(type_str, g_extern.config_path,
if (*g_extern.config_path) type_str_size);
fill_pathname_base(type_str, g_extern.config_path,
type_str_size);
else
strlcpy(type_str, "<default>", type_str_size);
}
else else
setting_data_get_string_representation(setting, type_str, type_str_size); strlcpy(type_str, "<default>", type_str_size);
} }
else
setting_data_get_string_representation(setting, type_str, type_str_size);
} }
} }
#endif #endif