From be8e294c5644b39d69558bac99c9bd2b269afedd Mon Sep 17 00:00:00 2001
From: Jamiras <32680403+Jamiras@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:36:52 -0700
Subject: [PATCH] don't flag rewind as initialized until after we're able to
 validate against core info (#15983)

---
 state_manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/state_manager.c b/state_manager.c
index 98ea01bbc5..b886708d15 100644
--- a/state_manager.c
+++ b/state_manager.c
@@ -597,7 +597,6 @@ void state_manager_event_init(
                                  | STATE_MGR_REWIND_ST_FLAG_HOTKEY_WAS_CHECKED
                                  | STATE_MGR_REWIND_ST_FLAG_HOTKEY_WAS_PRESSED
                                     );
-   rewind_st->flags             |= STATE_MGR_REWIND_ST_FLAG_INIT_ATTEMPTED;
 
    /* We cannot initialise the rewind buffer
     * unless the core info struct for the current
@@ -607,6 +606,8 @@ void state_manager_event_init(
    if (!core_info_get_current_core(&core_info) || !core_info)
       return;
 
+   rewind_st->flags |= STATE_MGR_REWIND_ST_FLAG_INIT_ATTEMPTED;
+
    if (!core_info_current_supports_rewind())
    {
       RARCH_ERR("%s\n", msg_hash_to_str(MSG_REWIND_UNSUPPORTED));