diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 980de0e93f..9c9d3c6194 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -848,12 +848,12 @@ static void win32_save_position(void)
 
    if (window_save_positions)
    {
-      video_driver_state_t *video_st = video_state_get_ptr();
+      uint32_t video_st_flags        = video_driver_get_st_flags();
       bool video_fullscreen          = settings->bools.video_fullscreen;
 
       if (     !video_fullscreen
-            && !(video_st->flags & VIDEO_FLAG_FORCE_FULLSCREEN)
-            && !(video_st->flags & VIDEO_FLAG_IS_SWITCHING_DISPLAY_MODE))
+            && !(video_st_flags & VIDEO_FLAG_FORCE_FULLSCREEN)
+            && !(video_st_flags & VIDEO_FLAG_IS_SWITCHING_DISPLAY_MODE))
       {
          bool ui_menubar_enable = settings->bools.ui_menubar_enable;
          bool window_show_decor = settings->bools.video_window_show_decorations;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 5dea82d320..767396c9e8 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -4358,3 +4358,9 @@ void video_frame_delay_auto(video_driver_state_t *video_st, video_frame_delay_au
       );
 #endif
 }
+
+uint32_t video_driver_get_st_flags(void)
+{
+   video_driver_state_t *video_st                 = &video_driver_st;
+   return video_st->flags;
+}
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 63fad385df..0b48f4b92f 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -1399,6 +1399,8 @@ void video_driver_set_viewport_config(
 
 void video_driver_set_viewport_square_pixel(struct retro_game_geometry *geom);
 
+uint32_t video_driver_get_st_flags(void);
+
 bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled);
 
 /**
diff --git a/retroarch.c b/retroarch.c
index d9bc0edc1c..7d2642c759 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3823,7 +3823,7 @@ int rarch_main(int argc, char *argv[], void *data)
    audio_state_get_ptr()->flags |= AUDIO_FLAG_ACTIVE;
 
    {
-      unsigned i;
+      int i;
       for (i = 0; i < MAX_USERS; i++)
          input_config_set_device(i, RETRO_DEVICE_JOYPAD);
    }