mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename function to menu_load_content

Browse Source
This commit is contained in:
twinaphex 2015-01-10 06:09:30 +01:00
parent b2c03ccbfb
commit 62b430e6eb
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/menu.c
View File

@ -110,7 +110,15 @@ static void push_to_history_playlist(void)
g_extern.menu.info.library_name);
}
bool load_menu_content(void)
/**
* menu_load_content:
*
* Loads content into currently selected core.
* Will also optionally push the content entry to the history playlist.
*
* Returns: true (1) if successful, otherwise false (0).
**/
bool menu_load_content(void)
{
if (*g_extern.fullpath || (driver.menu && driver.menu->load_no_content))
push_to_history_playlist();

10
menu/menu.h
View File

@ -201,7 +201,15 @@ void menu_free(void *data);
void menu_ticker_line(char *buf, size_t len, unsigned tick,
const char *str, bool selected);
bool load_menu_content(void);
/**
* menu_load_content:
*
* Loads content into currently selected core.
* Will also optionally push the content entry to the history playlist.
*
* Returns: true (1) if successful, otherwise false (0).
**/
bool menu_load_content(void);
void menu_update_system_info(menu_handle_t *menu, bool *load_no_content);

2
retroarch.c
View File

@ -2087,7 +2087,7 @@ void rarch_main_set_state(unsigned cmd)
case RARCH_ACTION_STATE_LOAD_CONTENT:
#ifdef HAVE_MENU
/* If content loading fails, we go back to menu. */
if (!load_menu_content())
if (!menu_load_content())
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
#endif
if (driver.frontend_ctx && driver.frontend_ctx->content_loaded)