From 517a0394d2ba15b517e2a2b7384a7cc98b11b80d Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Sat, 10 Jun 2017 22:44:01 +0100
Subject: [PATCH] Don't wait for toolbar in NS native fullscreen

* src/nsterm.m (EmacsView:updateFrameSize): Don't short-circuit the
function when in fullscreen.
---
 src/nsterm.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index e69aa43dd37..633ca3bf76b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6560,7 +6560,10 @@ not_in_argv (NSString *arg)
 
   if (wait_for_tool_bar)
     {
-      if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0)
+      /* The toolbar height is always 0 in fullscreen, so don't wait
+         for it to become available. */
+      if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0
+          && ! [self isFullscreen])
         {
           NSTRACE_MSG ("Waiting for toolbar");
           return;
-- 
2.39.2