From 78a7e56befb43d56d9c34c7eca9bdf621a12c0ef Mon Sep 17 00:00:00 2001
From: Dmitry Zhlobo <dima@zhlobo.net>
Date: Mon, 5 May 2025 23:52:39 +0200
Subject: [PATCH] macOS: don't crash when opening non-native fullsreen at
 launch

When we launch ghostty with `fullscreen = true` and
`macos-non-native-fullscreen = true` there's no window to check
CGSSpaces for.

Fixes #7114
---
 macos/Sources/Helpers/Fullscreen.swift | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/macos/Sources/Helpers/Fullscreen.swift b/macos/Sources/Helpers/Fullscreen.swift
index b6fb08271..c943eab3c 100644
--- a/macos/Sources/Helpers/Fullscreen.swift
+++ b/macos/Sources/Helpers/Fullscreen.swift
@@ -355,16 +355,23 @@ class NonNativeFullscreen: FullscreenBase, FullscreenStyle {
             self.styleMask = window.styleMask
             self.dock = window.screen?.hasDock ?? false
 
-            // We hide the menu only if this window is not on any fullscreen
-            // spaces. We do this because fullscreen spaces already hide the
-            // menu and if we insert/remove this presentation option we get
-            // issues (see #7075)
-            let activeSpace = CGSSpace.active()
-            let spaces = CGSSpace.list(for: window.cgWindowId)
-            if spaces.contains(activeSpace) {
-                self.menu = activeSpace.type != .fullscreen
+            if (window.isVisible) {
+                // We hide the menu only if this window is not on any fullscreen
+                // spaces. We do this because fullscreen spaces already hide the
+                // menu and if we insert/remove this presentation option we get
+                // issues (see #7075)
+                let activeSpace = CGSSpace.active()
+                let spaces = CGSSpace.list(for: window.cgWindowId)
+                if spaces.contains(activeSpace) {
+                    self.menu = activeSpace.type != .fullscreen
+                } else {
+                    self.menu = spaces.allSatisfy { $0.type != .fullscreen }
+                }
             } else {
-                self.menu = spaces.allSatisfy { $0.type != .fullscreen }
+                // When window is not visible at the moment of toggling non-native
+                // fullscreen it means it is launched with `fullscreen = true` and
+                // we want to hide menu in this case.
+                self.menu = true;
             }
         }
     }