mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 06:44:27 +00:00
prevent frame step when hitting rewind button while paused in hardcore (#15622)
This commit is contained in:
parent
a8ed353ce4
commit
e3d64ab118
12
runloop.c
12
runloop.c
@ -6097,6 +6097,10 @@ static enum runloop_state_enum runloop_check_state(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHEEVOS
|
#ifdef HAVE_CHEEVOS
|
||||||
|
/* Make sure not to evaluate this before calling menu_driver_iterate
|
||||||
|
* as that may change its value */
|
||||||
|
cheevos_hardcore_active = rcheevos_hardcore_active();
|
||||||
|
|
||||||
if (!cheevos_hardcore_active)
|
if (!cheevos_hardcore_active)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
@ -6235,10 +6239,6 @@ static enum runloop_state_enum runloop_check_state(
|
|||||||
pause_pressed |= BIT256_GET(current_bits, RETRO_DEVICE_ID_JOYPAD_START);
|
pause_pressed |= BIT256_GET(current_bits, RETRO_DEVICE_ID_JOYPAD_START);
|
||||||
|
|
||||||
#ifdef HAVE_CHEEVOS
|
#ifdef HAVE_CHEEVOS
|
||||||
/* Make sure not to evaluate this before calling menu_driver_iterate
|
|
||||||
* as that may change its value */
|
|
||||||
cheevos_hardcore_active = rcheevos_hardcore_active();
|
|
||||||
|
|
||||||
if (cheevos_hardcore_active)
|
if (cheevos_hardcore_active)
|
||||||
{
|
{
|
||||||
static int unpaused_frames = 0;
|
static int unpaused_frames = 0;
|
||||||
@ -6301,7 +6301,11 @@ static enum runloop_state_enum runloop_check_state(
|
|||||||
if (!frameadvance_trigger)
|
if (!frameadvance_trigger)
|
||||||
#endif
|
#endif
|
||||||
focused = false;
|
focused = false;
|
||||||
|
#ifdef HAVE_CHEEVOS
|
||||||
|
else if (!cheevos_hardcore_active)
|
||||||
|
#else
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
runloop_paused = false;
|
runloop_paused = false;
|
||||||
|
|
||||||
/* Drop to RUNLOOP_STATE_POLLED_AND_SLEEP if frameadvance is triggered */
|
/* Drop to RUNLOOP_STATE_POLLED_AND_SLEEP if frameadvance is triggered */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user