From d8f828cf06f459841387ea0f918e07178038cb82 Mon Sep 17 00:00:00 2001
From: Aaron Jensen <aaronjensen@gmail.com>
Date: Sat, 16 Nov 2024 20:54:59 -0800
Subject: [PATCH] Fix NS non-native fullscreen on initial frame load
 (bug#59790)

* src/nsterm.m ([EmacsView toggleFullScreen:]): Reset fs_is_native

(cherry picked from commit 03ae07291e85fd353595806c3ce1ad3315c47649)
---
 src/nsterm.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nsterm.m b/src/nsterm.m
index 205b1621399..dceb3cebb4d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8524,6 +8524,11 @@ ns_in_echo_area (void)
 
   NSTRACE ("[EmacsView toggleFullScreen:]");
 
+  /* Reset fs_is_native to value of ns-use-native-full-screen if not
+     fullscreen already */
+  if (fs_state != FULLSCREEN_BOTH)
+    fs_is_native = ns_use_native_fullscreen;
+
   if (fs_is_native)
     {
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
-- 
2.39.5