diff options
| author | Win Treese | 2020-09-08 15:32:15 -0400 |
|---|---|---|
| committer | Alan Third | 2020-09-08 21:49:38 +0100 |
| commit | 9c42f1f7f0a34dcfaee92c10964a61ee49770ac3 (patch) | |
| tree | db7467bb86fece2f4e261208433fe033e8e50be6 /src | |
| parent | 60de60b35079eecbadf65e2fa71d1098f9040055 (diff) | |
| download | emacs-9c42f1f7f0a34dcfaee92c10964a61ee49770ac3.tar.gz emacs-9c42f1f7f0a34dcfaee92c10964a61ee49770ac3.zip | |
Fix crash from clicking on menu bar (bug#34762, bug#26982)
* src/nsmenu.m (ns_update_menubar): Remove extraneous use of
autorelease pool.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsmenu.m | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index e313fc03f40..a286a80da17 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -122,7 +122,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 122 | /*fprintf (stderr, "ns_update_menubar: frame: %p\tdeep: %d\tsub: %p\n", f, deep_p, submenu); */ | 122 | /*fprintf (stderr, "ns_update_menubar: frame: %p\tdeep: %d\tsub: %p\n", f, deep_p, submenu); */ |
| 123 | 123 | ||
| 124 | block_input (); | 124 | block_input (); |
| 125 | pool = [[NSAutoreleasePool alloc] init]; | ||
| 126 | 125 | ||
| 127 | /* Menu may have been created automatically; if so, discard it. */ | 126 | /* Menu may have been created automatically; if so, discard it. */ |
| 128 | if ([menu isKindOfClass: [EmacsMenu class]] == NO) | 127 | if ([menu isKindOfClass: [EmacsMenu class]] == NO) |
| @@ -240,7 +239,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 240 | [[submenu title] UTF8String]); | 239 | [[submenu title] UTF8String]); |
| 241 | discard_menu_items (); | 240 | discard_menu_items (); |
| 242 | unbind_to (specpdl_count, Qnil); | 241 | unbind_to (specpdl_count, Qnil); |
| 243 | [pool release]; | ||
| 244 | unblock_input (); | 242 | unblock_input (); |
| 245 | return; | 243 | return; |
| 246 | } | 244 | } |
| @@ -298,7 +296,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 298 | free_menubar_widget_value_tree (first_wv); | 296 | free_menubar_widget_value_tree (first_wv); |
| 299 | discard_menu_items (); | 297 | discard_menu_items (); |
| 300 | unbind_to (specpdl_count, Qnil); | 298 | unbind_to (specpdl_count, Qnil); |
| 301 | [pool release]; | ||
| 302 | unblock_input (); | 299 | unblock_input (); |
| 303 | return; | 300 | return; |
| 304 | } | 301 | } |
| @@ -364,7 +361,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 364 | if (NILP (items)) | 361 | if (NILP (items)) |
| 365 | { | 362 | { |
| 366 | free_menubar_widget_value_tree (first_wv); | 363 | free_menubar_widget_value_tree (first_wv); |
| 367 | [pool release]; | ||
| 368 | unblock_input (); | 364 | unblock_input (); |
| 369 | return; | 365 | return; |
| 370 | } | 366 | } |
| @@ -395,7 +391,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 395 | if (i == n) | 391 | if (i == n) |
| 396 | { | 392 | { |
| 397 | free_menubar_widget_value_tree (first_wv); | 393 | free_menubar_widget_value_tree (first_wv); |
| 398 | [pool release]; | ||
| 399 | unblock_input (); | 394 | unblock_input (); |
| 400 | return; | 395 | return; |
| 401 | } | 396 | } |
| @@ -454,7 +449,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 454 | if (needsSet) | 449 | if (needsSet) |
| 455 | [NSApp setMainMenu: menu]; | 450 | [NSApp setMainMenu: menu]; |
| 456 | 451 | ||
| 457 | [pool release]; | ||
| 458 | unblock_input (); | 452 | unblock_input (); |
| 459 | 453 | ||
| 460 | } | 454 | } |