diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m
index 684596a2fa..38420dca48 100644
--- a/gfx/common/metal_common.m
+++ b/gfx/common/metal_common.m
@@ -292,10 +292,16 @@
 {
    @autoreleasepool
    {
+      bool statistics_show = video_info->statistics_show;
+#ifdef HAVE_GFX_WIDGETS
+      bool widgets_inited  = video_info->widgets_inited;
+#endif
+
       [self _beginFrame];
 
       _frameView.frameCount = frameCount;
-      if (data && width && height) {
+      if (data && width && height)
+      {
          _frameView.size = CGSizeMake(width, height);
          [_frameView updateFrame:data pitch:pitch];
       }
@@ -318,7 +324,7 @@
       }
 #endif
 
-      if (video_info->statistics_show)
+      if (statistics_show)
       {
          struct font_params *osd_params = (struct font_params *)&video_info->osd_stat_params;
 
@@ -331,7 +337,7 @@
       }
 
 #ifdef HAVE_GFX_WIDGETS
-      if (video_info->widgets_inited)
+      if (widgets_inited)
       {
          [rce pushDebugGroup:@"menu widgets"];
          gfx_widgets_frame(video_info);
diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index 249427f519..5a39742635 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -1453,8 +1453,15 @@ void gfx_widgets_frame(void *data)
 {
    size_t i;
    video_frame_info_t *video_info = (video_frame_info_t*)data;
+   bool framecount_show           = video_info->framecount_show;
+   bool memory_show               = video_info->memory_show;
    unsigned video_width           = video_info->width;
    unsigned video_height          = video_info->height;
+   bool widgets_is_paused         = video_info->widgets_is_paused;
+   bool fps_show                  = video_info->fps_show;
+   bool widgets_is_fastforwarding = video_info->widgets_is_fast_forwarding;
+   bool widgets_is_rewinding      = video_info->widgets_is_rewinding;
+   bool runloop_is_slowmotion     = video_info->runloop_is_slowmotion;
    int top_right_x_advance        = video_width;
    int scissor_me_timbers         = 0;
 
@@ -1866,9 +1873,9 @@ void gfx_widgets_frame(void *data)
    }
 
    /* FPS Counter */
-   if (     video_info->fps_show 
-         || video_info->framecount_show
-         || video_info->memory_show
+   if (     fps_show 
+         || framecount_show
+         || memory_show
          )
    {
       const char *text      = *gfx_widgets_fps_text == '\0' ? "N/A" : gfx_widgets_fps_text;
@@ -1901,24 +1908,24 @@ void gfx_widgets_frame(void *data)
    }
 
    /* Indicators */
-   if (video_info->widgets_is_paused)
+   if (widgets_is_paused)
       top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
-         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_PAUSED], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance,
+         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_PAUSED], (fps_show ? simple_widget_height : 0), top_right_x_advance,
          MSG_PAUSED);
 
-   if (video_info->widgets_is_fast_forwarding)
+   if (widgets_is_fastforwarding)
       top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
-         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_FAST_FORWARD], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance,
+         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_FAST_FORWARD], (fps_show ? simple_widget_height : 0), top_right_x_advance,
          MSG_PAUSED);
 
-   if (video_info->widgets_is_rewinding)
+   if (widgets_is_rewinding)
       top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
-         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_REWIND], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance,
+         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_REWIND], (fps_show ? simple_widget_height : 0), top_right_x_advance,
          MSG_REWINDING);
 
-   if (video_info->runloop_is_slowmotion)
+   if (runloop_is_slowmotion)
       top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
-         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_SLOW_MOTION], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance,
+         gfx_widgets_icons_textures[MENU_WIDGETS_ICON_SLOW_MOTION], (fps_show ? simple_widget_height : 0), top_right_x_advance,
          MSG_SLOW_MOTION);
 
    /* Screenshot */
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index d0661c996b..eeb00a21ec 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -2103,7 +2103,8 @@ const char *menu_driver_ident(void)
 
 void menu_driver_frame(video_frame_info_t *video_info)
 {
-   if (video_info->menu_is_alive && menu_driver_ctx->frame)
+   bool menu_is_alive = video_info->menu_is_alive;
+   if (menu_is_alive && menu_driver_ctx->frame)
       menu_driver_ctx->frame(menu_userdata, video_info);
 }