>From 5a652de0e955185fafdad3b2aa886c0fdf48e679 Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Tue, 14 Sep 2021 13:03:37 +0100
Subject: [PATCH] A further fix for toolbar visibility problems on macOS
 (bug#50534)

* src/nsterm.m (ns_update_begin): Ensure the toolbar's visibility is
set correctly.
---
 src/nsterm.m | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 33850544b0..14dc6573b8 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1034,16 +1034,14 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
 
   ns_update_auto_hide_menu_bar ();
 
-#ifdef NS_IMPL_COCOA
-  if ([view isFullscreen] && [view fsIsNative])
+  NSToolbar *toolbar = [[FRAME_NS_VIEW (f) window] toolbar];
+  if (toolbar)
   {
-    // Fix reappearing tool bar in fullscreen for Mac OS X 10.7
+    /* Ensure the toolbars visibility is set correctly.  */
     BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (f) ? YES : NO;
-    NSToolbar *toolbar = [[FRAME_NS_VIEW (f) window] toolbar];
     if (! tbar_visible != ! [toolbar isVisible])
       [toolbar setVisible: tbar_visible];
   }
-#endif
 
   ns_updating_frame = f;
   [view lockFocus];
-- 
2.30.2