mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup menu_common_load_content

Browse Source
This commit is contained in:
twinaphex 2015-09-07 02:34:27 +02:00
parent 32e97ffd46
commit 6d9dba8a45
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/menu.c
View File

@ -151,6 +151,7 @@ int menu_common_load_content(
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
menu_display_t *disp = menu_display_get_ptr(); menu_display_t *disp = menu_display_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
enum event_command cmd = EVENT_CMD_NONE;
if (core_path) if (core_path)
{ {
@ -167,20 +168,23 @@ int menu_common_load_content(
{ {
case CORE_TYPE_PLAIN: case CORE_TYPE_PLAIN:
case CORE_TYPE_DUMMY: case CORE_TYPE_DUMMY:
event_command(persist ? EVENT_CMD_LOAD_CONTENT_PERSIST : EVENT_CMD_LOAD_CONTENT); cmd = persist ? EVENT_CMD_LOAD_CONTENT_PERSIST : EVENT_CMD_LOAD_CONTENT;
break; break;
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
case CORE_TYPE_FFMPEG: case CORE_TYPE_FFMPEG:
event_command(EVENT_CMD_LOAD_CONTENT_FFMPEG); cmd = EVENT_CMD_LOAD_CONTENT_FFMPEG;
break; break;
#endif #endif
case CORE_TYPE_IMAGEVIEWER: case CORE_TYPE_IMAGEVIEWER:
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
event_command(EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER); cmd = EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER;
#endif #endif
break; break;
} }
if (cmd != EVENT_CMD_NONE)
event_command(cmd);
menu_list_flush_stack(menu_list, NULL, MENU_SETTINGS); menu_list_flush_stack(menu_list, NULL, MENU_SETTINGS);
disp->msg_force = true; disp->msg_force = true;