[Emacs-diffs] trunk r116916: * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO

[Jan D.]

------------------------------------------------------------
revno: 116916
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16976
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Mon 2014-03-31 08:20:04 +0200
message:
  * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsmenu.m                   nsmenu.m-20091113204419-o5vbwnq5f7feedwu-8744

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-30 17:21:20 +0000
+++ b/src/ChangeLog     2014-03-31 06:20:04 +0000
@@ -1,3 +1,7 @@
+2014-03-31  Jan Djärv  <address@hidden>
+
+       * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976)
+
 2014-03-30  Jan Djärv  <address@hidden>
 
        * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2014-03-30 17:21:20 +0000
+++ b/src/nsmenu.m      2014-03-31 06:20:04 +0000
@@ -1054,8 +1054,10 @@
     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 ();
 }