Safety for menu_shader_get()
This commit is contained in:
parent
48f5677417
commit
ac959fef26
18
retroarch.c
18
retroarch.c
|
@ -3667,10 +3667,13 @@ bool command_event(enum event_command cmd, void *data)
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
|
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
|
||||||
/* Restore shader option state after temporary fast toggling */
|
/* Restore shader option state after temporary fast toggling */
|
||||||
if (menu_shader_get()->flags & SHDR_FLAG_TEMPORARY)
|
|
||||||
{
|
{
|
||||||
bool enabled = !(menu_shader_get()->flags & SHDR_FLAG_DISABLED);
|
const struct video_shader *menu_shader = menu_shader_get();
|
||||||
configuration_set_bool(settings, settings->bools.video_shader_enable, enabled);
|
if (menu_shader && menu_shader->flags & SHDR_FLAG_TEMPORARY)
|
||||||
|
{
|
||||||
|
bool enabled = !(menu_shader->flags & SHDR_FLAG_DISABLED);
|
||||||
|
configuration_set_bool(settings, settings->bools.video_shader_enable, enabled);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -8627,10 +8630,13 @@ bool retroarch_main_quit(void)
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
|
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
|
||||||
/* Restore shader option state after temporary fast toggling */
|
/* Restore shader option state after temporary fast toggling */
|
||||||
if (menu_shader_get()->flags & SHDR_FLAG_TEMPORARY)
|
|
||||||
{
|
{
|
||||||
bool enabled = !(menu_shader_get()->flags & SHDR_FLAG_DISABLED);
|
const struct video_shader *menu_shader = menu_shader_get();
|
||||||
configuration_set_bool(settings, settings->bools.video_shader_enable, enabled);
|
if (menu_shader && menu_shader->flags & SHDR_FLAG_TEMPORARY)
|
||||||
|
{
|
||||||
|
bool enabled = !(menu_shader->flags & SHDR_FLAG_DISABLED);
|
||||||
|
configuration_set_bool(settings, settings->bools.video_shader_enable, enabled);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue