From 1f984e12b46da4e8758b8c547cd90d5dac72a1fd Mon Sep 17 00:00:00 2001 From: Jan D Date: Thu, 1 Jul 2010 12:45:26 +0200 Subject: [PATCH] * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add BLOCK/UNBLOCK_INPUT so asserts don't trigger. --- src/ChangeLog | 5 +++++ src/nsmenu.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 2667ef41ad0..c6af9f218ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-01 Jan Djärv + + * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add + BLOCK/UNBLOCK_INPUT so asserts don't trigger. + 2010-06-30 Chong Yidong * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't diff --git a/src/nsmenu.m b/src/nsmenu.m index f85ebc165af..5fc3d0f5a41 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -999,7 +999,9 @@ free_frame_tool_bar (FRAME_PTR f) Under NS we just hide the toolbar until it might be needed again. -------------------------------------------------------------------------- */ { + BLOCK_INPUT; [[FRAME_NS_VIEW (f) toolbar] setVisible: NO]; + UNBLOCK_INPUT; } void @@ -1011,6 +1013,7 @@ update_frame_tool_bar (FRAME_PTR f) int i; EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar]; + BLOCK_INPUT; [toolbar clearActive]; /* update EmacsToolbar as in GtkUtils, build items list */ @@ -1094,6 +1097,7 @@ update_frame_tool_bar (FRAME_PTR f) [newDict release]; } + UNBLOCK_INPUT; } -- 2.39.2