From abe133666d5703307ee6e5485578d37a1d6093f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 31 Mar 2014 08:20:04 +0200 Subject: [PATCH] * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO Fixes: debbugs:16976 --- src/ChangeLog | 4 ++++ src/nsmenu.m | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 46f6f312050..92be5b00246 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-03-31 Jan Djärv + + * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) + 2014-03-30 Jan Djärv * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool diff --git a/src/nsmenu.m b/src/nsmenu.m index 321e0d92e1e..24842241f37 100644 --- 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 (); } -- 2.39.5