mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-09-03 05:03:05 +02:00
parent 584c276312
commit b57aca6f08
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/backend/menu_common_shader_backend.c
View File

@ -97,6 +97,7 @@ static void menu_common_shader_manager_set_preset(struct gfx_shader *shader,
unsigned type, const char *cgp_path)
{
RARCH_LOG("Setting Menu shader: %s.\n", cgp_path ? cgp_path : "N/A (stock)");
g_settings.video.shader_enable = false;
if (driver.video->set_shader && driver.video->set_shader(driver.video_data,
(enum rarch_shader_type)type, cgp_path))
@ -128,11 +129,6 @@ static void menu_common_shader_manager_set_preset(struct gfx_shader *shader,
driver.menu->need_refresh = true;
}
}
else
{
RARCH_ERR("Setting Menu CGP failed.\n");
g_settings.video.shader_enable = false;
}
}
static void menu_common_shader_manager_get_str(struct gfx_shader *shader,

13
frontend/menu/menu_common.c
View File

@ -104,11 +104,10 @@ void menu_content_history_push_current(void)
path_resolve_realpath(tmp, sizeof(tmp));
if (g_extern.system.no_content || *tmp)
if (g_extern.history)
content_playlist_push(g_extern.history,
*tmp ? tmp : NULL,
g_settings.libretro,
g_extern.system.info.library_name);
content_playlist_push(g_extern.history,
*tmp ? tmp : NULL,
g_settings.libretro,
g_extern.system.info.library_name);
}
static void load_menu_content_prepare(void)
@ -614,8 +613,8 @@ static inline int menu_list_get_first_char(file_list_t *buf,
file_list_get_alt_at_offset(buf, offset, &path);
ret = tolower(*path);
/* "Normalize" non-alphabetical entries so they are lumped together
* for purposes of jumping. */
/* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */
if (ret < 'a')
ret = 'a' - 1;
else if (ret > 'z')

3
frontend/menu/menu_entries.c
View File

@ -780,8 +780,7 @@ int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list)
if (!strcmp(label, "core_list"))
{
file_list_get_last(menu_list, &dir, NULL,
&menu_type);
file_list_get_last(menu_list, &dir, NULL, NULL);
list_size = file_list_get_size(list);
for (i = 0; i < list_size; i++)