State slot hotkey adjustments (#18388)

* Allow Auto slot with state hotkeys

* Hide state thumbnail widget on state load

* State slot msg reformat

Author: sonninnos

command.c

@@ -93,6 +93,11 @@ static void command_post_state_loaded(void)
      if (frame_time_counter_reset_after_load_state)
         video_st->frame_time_count = 0;
    }
+#if defined(HAVE_GFX_WIDGETS) && defined(HAVE_SCREENSHOTS)
+   {
+      gfx_widget_state_slot_show(dispwidget_get_ptr(), NULL, NULL);
+   }
+#endif
 }
 
 #if defined(HAVE_COMMAND)

gfx/widgets/gfx_widget_screenshot.c

@@ -100,6 +100,15 @@ static void gfx_widget_screenshot_fadeout(void *userdata)
    gfx_animation_push(&entry);
 }
 
+static void gfx_widget_screenshot_dispose(void *userdata)
+{
+   gfx_widget_screenshot_state_t *state = &p_w_screenshot_st;
+
+   state->loaded  = false;
+   video_driver_texture_unload(&state->texture);
+   state->texture = 0;
+}
+
 static void gfx_widgets_play_screenshot_flash(void *data)
 {
    gfx_animation_ctx_entry_t entry;
@@ -136,6 +145,12 @@ void gfx_widget_state_slot_show(
 
    state->state_slot = true;
 
+   if (!shotname || !filename)
+   {
+      gfx_widget_screenshot_dispose(NULL);
+      return;
+   }
+
    strlcpy(state->filename, filename, sizeof(state->filename));
    strlcpy(state->shotname, shotname, sizeof(state->shotname));
 }
@@ -160,15 +175,6 @@ void gfx_widget_screenshot_taken(
    }
 }
 
-static void gfx_widget_screenshot_dispose(void *userdata)
-{
-   gfx_widget_screenshot_state_t *state = &p_w_screenshot_st;
-
-   state->loaded  = false;
-   video_driver_texture_unload(&state->texture);
-   state->texture = 0;
-}
-
 static void gfx_widget_screenshot_end(void *userdata)
 {
    gfx_animation_ctx_entry_t entry;

intl/msg_hash_us.h

@@ -15080,11 +15080,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_LOADED_STATE_FROM_SLOT,
-   "Loaded state from slot #%d."
+   "Loaded state from slot: %d."
    )
 MSG_HASH(
    MSG_LOADED_STATE_FROM_SLOT_AUTO,
-   "Loaded state from slot #-1 (Auto)."
+   "Loaded state from slot: Auto."
    )
 MSG_HASH(
    MSG_LOADING,
@@ -15288,11 +15288,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_SAVED_STATE_TO_SLOT,
-   "Saved state to slot #%d."
+   "Saved state to slot: %d."
    )
 MSG_HASH(
    MSG_SAVED_STATE_TO_SLOT_AUTO,
-   "Saved state to slot #-1 (Auto)."
+   "Saved state to slot: Auto."
    )
 MSG_HASH(
    MSG_SAVED_SUCCESSFULLY_TO,

runloop.c

@@ -6900,9 +6900,9 @@ static enum runloop_state_enum runloop_check_state(
       {
          check = true;
          state_slot--;
-         /* Wrap to 0 */
+         /* Wrap to Auto */
          if (state_slot < 0)
-            state_slot = 0;
+            state_slot = -1;
       }
 
       if (check)
@@ -6925,10 +6925,17 @@ static enum runloop_state_enum runloop_check_state(
 
             if (state_slot > 0)
                _len += snprintf(path + _len, sizeof(path) - _len, "%d", state_slot);
+            else if (state_slot < 0)
+               _len  = fill_pathname_join_delim(path,
+                     runloop_st->name.savestate, "auto", '.', sizeof(path));
 
             strlcpy(path + _len, FILE_PATH_PNG_EXTENSION, sizeof(path) - _len);
 
-            snprintf(msg, sizeof(msg), "%d", state_slot);
+            if (state_slot < 0)
+               snprintf(msg, sizeof(msg), "%s", "Auto");
+            else
+               snprintf(msg, sizeof(msg), "%d", state_slot);
+
             gfx_widget_state_slot_show(dispwidget_get_ptr(), msg, path);
          }
          else