mirror of
https://github.com/libretro/RetroArch
synced 2025-03-20 10:20:51 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
508fc65292
@ -361,6 +361,8 @@ static void rmenu_xui_render(void *data)
|
||||
strlcpy(title, "DISK OPTIONS", sizeof(title));
|
||||
else if (menu_type == RGUI_SETTINGS_CORE_OPTIONS)
|
||||
strlcpy(title, "CORE OPTIONS", sizeof(title));
|
||||
else if (menu_type == RGUI_SETTINGS_CORE_INFO)
|
||||
strlcpy(title, "CORE INFO", sizeof(title));
|
||||
#ifdef HAVE_SHADER_MANAGER
|
||||
else if (menu_type_is(menu_type) == RGUI_SETTINGS_SHADER_OPTIONS)
|
||||
snprintf(title, sizeof(title), "SHADER %s", dir);
|
||||
|
@ -2109,7 +2109,7 @@ void menu_populate_entries(void *data, unsigned menu_type)
|
||||
}
|
||||
|
||||
file_list_push(rgui->selection_buf, "Core Options", RGUI_SETTINGS_CORE_OPTIONS, 0);
|
||||
file_list_push(rgui->selection_buf, "Core Information", RGUI_SETTINGS_CORE_INFO, 0);
|
||||
file_list_push(rgui->selection_buf, "Core Information", RGUI_SETTINGS_CORE_INFO, 0);
|
||||
file_list_push(rgui->selection_buf, "Settings", RGUI_SETTINGS_OPTIONS, 0);
|
||||
file_list_push(rgui->selection_buf, "Drivers", RGUI_SETTINGS_DRIVERS, 0);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user