diff --git a/menu/menu_content.c b/menu/menu_content.c index 43f9839a22..b989cfef8d 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -99,7 +99,7 @@ static void menu_content_environment_get(int *argc, char *argv[], * Returns: true (1) if successful, otherwise false (0). **/ -bool menu_content_load(enum rarch_core_type type) +bool menu_content_load(void) { bool msg_force = true; char *fullpath = NULL; diff --git a/menu/menu_content.h b/menu/menu_content.h index d262bdbd86..7d0211800c 100644 --- a/menu/menu_content.h +++ b/menu/menu_content.h @@ -36,7 +36,7 @@ extern "C" { * * Returns: true (1) if successful, otherwise false (0). **/ -bool menu_content_load(enum rarch_core_type type); +bool menu_content_load(void); #ifdef __cplusplus } diff --git a/retroarch.c b/retroarch.c index 92c8abd178..3558ce6c49 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1410,27 +1410,11 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #endif break; case RARCH_CTL_LOAD_CONTENT: -#ifdef HAVE_MENU - /* If content loading fails, we go back to menu. */ - if (!menu_content_load(CORE_TYPE_PLAIN)) - rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL); -#endif - frontend_driver_content_loaded(); - break; -#ifdef HAVE_FFMPEG case RARCH_CTL_LOAD_CONTENT_FFMPEG: -#ifdef HAVE_MENU - /* If content loading fails, we go back to menu. */ - if (!menu_content_load(CORE_TYPE_FFMPEG)) - rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL); -#endif - frontend_driver_content_loaded(); - break; -#endif case RARCH_CTL_LOAD_CONTENT_IMAGEVIEWER: #ifdef HAVE_MENU /* If content loading fails, we go back to menu. */ - if (!menu_content_load(CORE_TYPE_IMAGEVIEWER)) + if (!menu_content_load()) rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL); #endif frontend_driver_content_loaded();