Ignore menu event action in the end of function instead (#15811)

libretro · Oct 16, 2023 · f69a292 · f69a292
1 parent e3becab
commit f69a292
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
@@ -5239,11 +5239,6 @@ unsigned menu_event(
 
    ok_old                                          = ok_current;
 
-   /* Menu must be alive, and input must be released after menu toggle. */
-   if (     !(menu_st->flags & MENU_ST_FLAG_ALIVE)
-         || menu_st->input_driver_flushing_input > 0)
-      return ret;
-
    /* Get pointer (mouse + touchscreen) input
     * Note: Must be done regardless of menu screensaver
     *       state */
@@ -5633,6 +5628,11 @@ unsigned menu_event(
          menu_st->input_last_time_us = menu_st->current_time_us;
    }
 
+   /* Menu must be alive, and input must be released after menu toggle. */
+   if (     !(menu_st->flags & MENU_ST_FLAG_ALIVE)
+         || menu_st->input_driver_flushing_input > 0)
+      return MENU_ACTION_NOOP;
+
    return ret;
 }