When 'Hide In Menu' is enabled, overlay should reappear now when we

select 'Resume Content', 'Load State', or 'Save State'
This commit is contained in:
twinaphex 2015-07-16 11:57:50 +02:00
parent b298b2d4f0
commit f938c75e0b
2 changed files with 8 additions and 7 deletions

View File

@ -1399,6 +1399,10 @@ void rarch_main_set_state(unsigned cmd)
menu_entries_set_refresh(); menu_entries_set_refresh();
menu_driver_set_alive(); menu_driver_set_alive();
#endif
#ifdef HAVE_OVERLAY
if (settings->input.overlay_hide_in_menu)
event_command(EVENT_CMD_OVERLAY_DEINIT);
#endif #endif
break; break;
case RARCH_ACTION_STATE_LOAD_CONTENT: case RARCH_ACTION_STATE_LOAD_CONTENT:
@ -1450,6 +1454,10 @@ void rarch_main_set_state(unsigned cmd)
system->key_event = global->frontend_key_event; system->key_event = global->frontend_key_event;
#endif #endif
video_driver_set_texture_enable(false, false); video_driver_set_texture_enable(false, false);
#ifdef HAVE_OVERLAY
if (settings->input.overlay_hide_in_menu)
event_command(EVENT_CMD_OVERLAY_INIT);
#endif
break; break;
case RARCH_ACTION_STATE_QUIT: case RARCH_ACTION_STATE_QUIT:
if (global) if (global)

View File

@ -424,18 +424,11 @@ static void do_state_check_menu_toggle(settings_t *settings, global_t *global)
if (menu_driver_alive()) if (menu_driver_alive())
{ {
if (global->main_is_init && (global->core_type != CORE_TYPE_DUMMY)) if (global->main_is_init && (global->core_type != CORE_TYPE_DUMMY))
{
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (settings->input.overlay_hide_in_menu)
event_command(EVENT_CMD_OVERLAY_INIT);
}
return; return;
} }
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
if (settings->input.overlay_hide_in_menu)
event_command(EVENT_CMD_OVERLAY_DEINIT);
} }
#endif #endif