ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make load_menu_game_prepare a static function and call it from 

load_menu_game
This commit is contained in:
twinaphex 2014-07-28 01:00:16 +02:00
parent 1175ced819
commit 458e4d83f4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/frontend.c
View File

@ -121,8 +121,6 @@ static int main_entry_iterate_content(args_type() args)
static int main_entry_iterate_load_content(args_type() args) static int main_entry_iterate_load_content(args_type() args)
{ {
load_menu_game_prepare();
if (load_menu_game()) if (load_menu_game())
{ {
g_extern.lifecycle_state |= (1ULL << MODE_GAME); g_extern.lifecycle_state |= (1ULL << MODE_GAME);

4
frontend/menu/menu_common.c
View File

@ -99,7 +99,7 @@ void menu_content_history_push_current(void)
g_extern.system.info.library_name); g_extern.system.info.library_name);
} }
void load_menu_game_prepare(void) static void load_menu_game_prepare(void)
{ {
if (!driver.menu) if (!driver.menu)
return; return;
@ -195,6 +195,8 @@ static void menu_environment_get(int *argc, char *argv[], void *args, void *para
bool load_menu_game(void) bool load_menu_game(void)
{ {
load_menu_game_prepare();
if (!(main_load_content(0, NULL, menu_environment_get, if (!(main_load_content(0, NULL, menu_environment_get,
driver.frontend_ctx->process_args))) driver.frontend_ctx->process_args)))
{ {

1
frontend/menu/menu_common.h
View File

@ -103,7 +103,6 @@ void menu_free(void *data);
void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str, bool selected); void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str, bool selected);
void load_menu_game_prepare(void);
bool load_menu_game(void); bool load_menu_game(void);
void load_menu_game_history(unsigned game_index); void load_menu_game_history(unsigned game_index);
void menu_content_history_push_current(void); void menu_content_history_push_current(void);