libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Revert "Main menu loop now does rendering, data runloop does actual"

Browse Source 
This reverts commit 297a63c77b.
This commit is contained in:
twinaphex 2015-09-25 00:20:53 +02:00
parent 297a63c77b
commit 8dbdc90ebe
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runloop.c
View File

@ -993,8 +993,6 @@ static void rarch_main_cmd_get_state(driver_t *driver,
RARCH_CHEAT_TOGGLE);
}
unsigned menu_input_this_frame;
/**
* rarch_main_iterate:
*
@ -1079,19 +1077,16 @@ int rarch_main_iterate(unsigned *sleep_ms)
}
#ifdef HAVE_MENU
menu_input_this_frame = 0;
if (menu_driver_alive())
{
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
{
menu_input_this_frame = menu_input_frame(input, trigger_input);
menu_iterate_render();
if (menu_iterate(true, menu_input_frame(input, trigger_input)) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (!input && settings->menu.pause_libretro)
return 1;
return rarch_limit_frame_time(settings->fastforward_ratio, sleep_ms);
}
if (!input && settings->menu.pause_libretro)
return 1;
return rarch_limit_frame_time(settings->fastforward_ratio, sleep_ms);
}
#endif

7
runloop_data.c
View File

@ -20,7 +20,6 @@
#include <file/file_path.h>
#include "general.h"
#include "retroarch.h"
#include "tasks/tasks.h"
#include "input/input_overlay.h"
@ -210,16 +209,14 @@ error:
#endif
#ifdef HAVE_MENU
extern unsigned menu_input_this_frame;
static void rarch_main_data_menu_iterate(void)
{
#ifdef HAVE_LIBRETRODB
if (rarch_main_data_db_pending_scan_finished())
menu_environment_cb(MENU_ENVIRON_RESET_HORIZONTAL_LIST, NULL);
#endif
if (menu_iterate(true, menu_input_this_frame) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
menu_iterate_render();
}
#endif