* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add

BLOCK/UNBLOCK_INPUT so asserts don't trigger.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2667ef41ad0c92a0f7a62c0008563d5c2372fba3..c6af9f218ae16a7693eaff5bd35bf76c214383b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
+       BLOCK/UNBLOCK_INPUT so asserts don't trigger.
+
 2010-06-30  Chong Yidong  <cyd@stupidchicken.com>
 
        * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't

diff --git a/src/nsmenu.m b/src/nsmenu.m
index f85ebc165af0966c47009f7ff73dc59d181ca1df..5fc3d0f5a4176753d08b66532a06a8c5cf34c45d 100644 (file)
--- 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;
 }