Only allow pausing when there is an active core

Revert "Only allow pausing when there is an active core"

This reverts commit fbf5d9b.

Stash

Only allow pausing when there is an active core

Author: alanide

retroarch.c

@@ -4236,6 +4236,10 @@ bool command_event(enum event_command cmd, void *data)
             /* The platform that uses ram_state_save calls it when the content
              * ends and writes it to a file */
             ram_state_to_file();
+            
+            /* Restore unpaused state */
+            runloop_st->paused_hotkey = false;
+            command_event(CMD_EVENT_UNPAUSE, NULL);
 
             /* Save auto state */
             if (     runloop_st
@@ -4736,6 +4740,10 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_PAUSE_TOGGLE:
          {
+            /* Allow pause toggling only when there is an active core. */
+            if (!(runloop_st->flags & RUNLOOP_FLAG_CORE_RUNNING))
+               break;
+            
             bool paused          = (runloop_st->flags & RUNLOOP_FLAG_PAUSED) ? true : false;
 #ifdef HAVE_ACCESSIBILITY
             bool accessibility_enable
@@ -4784,6 +4792,9 @@ bool command_event(enum event_command cmd, void *data)
          runloop_pause_checks();
          break;
       case CMD_EVENT_PAUSE:
+         /* Allow pausing only when there is an active core. */
+         if (!(runloop_st->flags & RUNLOOP_FLAG_CORE_RUNNING))
+            break;
 #ifdef HAVE_NETWORKING
          if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_ALLOW_PAUSE, NULL))
             break;

runloop.c

@@ -5587,7 +5587,6 @@ static enum runloop_state_enum runloop_check_state(
    gfx_display_t            *p_disp    = disp_get_ptr();
    runloop_state_t *runloop_st         = &runloop_state;
    static bool old_focus               = true;
-   static bool runloop_paused_hotkey   = false;
    struct retro_callbacks *cbs         = &runloop_st->retro_ctx;
    bool is_focused                     = false;
    bool is_alive                       = false;
@@ -5669,10 +5668,10 @@ static enum runloop_state_enum runloop_check_state(
       {
          BIT256_CLEAR_ALL(current_bits);
          if (      runloop_paused
-               && !runloop_paused_hotkey
+               && !runloop_st->paused_hotkey
                &&  menu_pause_libretro)
             BIT256_SET(current_bits, RARCH_PAUSE_TOGGLE);
-         else if (runloop_paused_hotkey)
+         else if (runloop_st->paused_hotkey)
          {
             /* Restore pause if pause is triggered with both hotkey and menu,
              * and restore cached video frame to continue properly to
@@ -6518,7 +6517,7 @@ static enum runloop_state_enum runloop_check_state(
       bool pause_pressed            = BIT256_GET(current_bits, RARCH_PAUSE_TOGGLE);
 
       /* Decide pause hotkey */
-      runloop_pause_toggle(&runloop_paused_hotkey,
+      runloop_pause_toggle(&runloop_st->paused_hotkey,
             pause_pressed, old_pause_pressed,
             focused, old_focus);
 
@@ -6595,7 +6594,7 @@ static enum runloop_state_enum runloop_check_state(
       }
 
       /* Decide pause hotkey */
-      runloop_pause_toggle(&runloop_paused_hotkey,
+      runloop_pause_toggle(&runloop_st->paused_hotkey,
             pause_pressed, old_pause_pressed,
             focused, old_focus);
 

runloop.h

@@ -300,6 +300,7 @@ struct runloop
    } name;
 
    bool perfcnt_enable;
+   bool paused_hotkey;
 };
 
 typedef struct runloop runloop_state_t;