mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_MENU ifdefs

Browse Source
This commit is contained in:
twinaphex 2016-05-17 07:53:38 +02:00
parent 0d850b9bda
commit 6c9715027f
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tasks/task_content.c
View File

@ -1826,6 +1826,7 @@ static void menu_content_environment_get(int *argc, char *argv[],
} }
#endif #endif
/** /**
* content_load_wrapper: * content_load_wrapper:
* *
@ -1841,10 +1842,12 @@ static bool content_load_wrapper(
{ {
char name[PATH_MAX_LENGTH]; char name[PATH_MAX_LENGTH];
char msg[PATH_MAX_LENGTH]; char msg[PATH_MAX_LENGTH];
bool add_to_playlist = false;
char *fullpath = NULL; char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
#ifdef HAVE_MENU
if (launched_from_menu) if (launched_from_menu)
{ {
/* redraw menu frame */ /* redraw menu frame */
@ -1853,6 +1856,7 @@ static bool content_load_wrapper(
fill_pathname_base(name, fullpath, sizeof(name)); fill_pathname_base(name, fullpath, sizeof(name));
} }
#endif
if (!content_load(content_info)) if (!content_load(content_info))
goto error; goto error;
@ -1866,14 +1870,24 @@ static bool content_load_wrapper(
runloop_msg_queue_push(msg, 1, 1, false); runloop_msg_queue_push(msg, 1, 1, false);
} }
} }
add_to_playlist = !string_is_empty(fullpath);
#ifdef HAVE_MENU
if (!add_to_playlist)
add_to_playlist = menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL);
#endif
/* Push entry to top of playlist */ /* Push entry to top of playlist */
if (!string_is_empty(fullpath) || if (add_to_playlist)
menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
{ {
struct retro_system_info *info = NULL; struct retro_system_info *info = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, #ifdef HAVE_MENU
&info); if (launched_from_menu)
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &info);
else
#endif
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
content_push_to_history_playlist(true, fullpath, info); content_push_to_history_playlist(true, fullpath, info);
playlist_write_file(g_defaults.history); playlist_write_file(g_defaults.history);
} }
@ -2033,10 +2047,12 @@ bool rarch_task_push_content_load_default(
case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
#ifdef HAVE_MENU
if (fullpath) if (fullpath)
menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
else else
menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL);
#endif
if (!command_event_cmd_exec((void*)fullpath)) if (!command_event_cmd_exec((void*)fullpath))
return false; return false;