mirror of
https://github.com/libretro/RetroArch
synced 2025-04-01 04:20:27 +00:00
Cleanups
This commit is contained in:
parent
247de41ce1
commit
17e78909d5
@ -553,15 +553,13 @@ unsigned menu_event(retro_input_t input,
|
|||||||
if (!menu_input)
|
if (!menu_input)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
core_poll();
|
|
||||||
|
|
||||||
/* don't run anything first frame, only capture held inputs
|
|
||||||
* for old_input_state. */
|
|
||||||
|
|
||||||
if (input.state)
|
if (input.state)
|
||||||
{
|
{
|
||||||
if (!first_held)
|
if (!first_held)
|
||||||
{
|
{
|
||||||
|
/* don't run anything first frame, only capture held inputs
|
||||||
|
* for old_input_state. */
|
||||||
|
|
||||||
first_held = true;
|
first_held = true;
|
||||||
menu_input->delay.timer = initial_held ? 12 : 6;
|
menu_input->delay.timer = initial_held ? 12 : 6;
|
||||||
menu_input->delay.count = 0;
|
menu_input->delay.count = 0;
|
||||||
|
@ -1549,12 +1549,14 @@ int runloop_iterate(unsigned *sleep_ms)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
core_poll();
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
|
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
|
||||||
{
|
{
|
||||||
int ret = runloop_iterate_menu((enum menu_action)
|
int ret = runloop_iterate_menu((enum menu_action)
|
||||||
menu_event(cmd.state[0], cmd.state[2]),
|
menu_event(cmd.state[0], cmd.state[2]),
|
||||||
sleep_ms);
|
sleep_ms);
|
||||||
|
|
||||||
if (ret == -1)
|
if (ret == -1)
|
||||||
goto end;
|
goto end;
|
||||||
@ -1566,7 +1568,6 @@ int runloop_iterate(unsigned *sleep_ms)
|
|||||||
if (!runloop_check_state(&cmd, &runloop_shader_dir))
|
if (!runloop_check_state(&cmd, &runloop_shader_dir))
|
||||||
{
|
{
|
||||||
/* RetroArch has been paused. */
|
/* RetroArch has been paused. */
|
||||||
core_poll();
|
|
||||||
*sleep_ms = 10;
|
*sleep_ms = 10;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user