* nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO

Fixes: debbugs:16976

diff --git a/src/ChangeLog b/src/ChangeLog
index 46f6f3120505b958092c28c65d4b8f47a8359d1e..92be5b002463176baa5541c9d7f7392e3217f0e1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976)
+
 2014-03-30  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 321e0d92e1ef0231c15dfbb2612d2b763f766b88..24842241f37e22d8f89583bd62bf3edeacd60415 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1054,8 +1054,10 @@ free_frame_tool_bar (struct frame *f)
     Under NS we just hide the toolbar until it might be needed again.
    -------------------------------------------------------------------------- */
 {
+  EmacsView *view = FRAME_NS_VIEW (f);
   block_input ();
-  [[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
+  view->wait_for_tool_bar = NO;
+  [[view toolbar] setVisible: NO];
   FRAME_TOOLBAR_HEIGHT (f) = 0;
   unblock_input ();
 }