summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nsterm.m5
1 files changed, 4 insertions, 1 deletions
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;