Fix incorrectly appearing toolbar on NS (bug#50534)

* src/nsmenu.m (update_frame_tool_bar): Ensure both sides of the test
are booleans.
* src/nsterm.m ([EmacsWindow createToolbar:]): Make the toolbar
non-visible initially, in case things get out of sync.  Remove call to
update_frame_tool_bar: the window isn't yet associated with the view,
so it will return immediately.

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 3493e4e131d014a1f6ee326a3d2931fd404e5255..f0c5bb24e6385dd20f513daadb321813d41dfb02 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1094,7 +1094,7 @@ update_frame_tool_bar (struct frame *f)
 #undef TOOLPROP
     }
 
-  if ([toolbar isVisible] != FRAME_EXTERNAL_TOOL_BAR (f))
+  if (![toolbar isVisible] != !FRAME_EXTERNAL_TOOL_BAR (f))
     {
       f->output_data.ns->in_animation = 1;
       [toolbar setVisible: FRAME_EXTERNAL_TOOL_BAR (f)];

diff --git a/src/nsterm.m b/src/nsterm.m
index 8d88f7bd3de3a76b9cc578372744642fe83af5e1..7c90bbd57877632d9cec5e1ff37189b4a6ee8b52 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8323,10 +8323,9 @@ not_in_argv (NSString *arg)
   EmacsToolbar *toolbar = [[EmacsToolbar alloc]
                             initForView:view
                             withIdentifier:[NSString stringWithLispString:f->name]];
+  [toolbar setVisible:NO];
   [self setToolbar:toolbar];
 
-  update_frame_tool_bar (f);
-
 #ifdef NS_IMPL_COCOA
   {
     NSButton *toggleButton;