bug#55687: 29.0.50; make-frame chid frame crash/regression from dfa3e6f424

[Aaron Jensen <aaronjensen@gmail.com>]

On Sun, May 29, 2022 at 12:08 PM Alan Third <alan@idiocy.org> wrote:
>
> On Sun, May 29, 2022 at 08:52:07AM -0400, Aaron Jensen wrote:
> > Interesting. Luckily, I have never run across this other then while
> > trying to repro the first bug I reported here. Alan, any ideas? Does
> > this crash for you?
>
> Works fine for me. You could maybe try something like this:

This fixes it for me.

> --- a/src/nsterm.m
> +++ b/src/nsterm.m
> @@ -7773,6 +7773,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
>    [self setLayerContentsPlacement:NSViewLayerContentsPlacementTopLeft];
>  #endif
>
> +  /* toolbar support */
> +  [(EmacsWindow*)[self window] createToolbar:f];
> +
>    if (ns_drag_types)
>      [self registerForDraggedTypes: ns_drag_types];
>
> @@ -8934,9 +8937,6 @@ - (instancetype) initWithEmacsFrame: (struct frame *) f
>        if ([col alphaComponent] != (EmacsCGFloat) 1.0)
>          [self setOpaque:NO];
>
> -      /* toolbar support */
> -      [self createToolbar:f];
> -
>        /* macOS Sierra automatically enables tabbed windows.  We can't
>           allow this to be enabled until it's available on a Free system.
>           Currently it only happens by accident and is buggy anyway.  */
>
> --
> Alan Third