From 180b4bad2e23279ad9790518fc8e09253eb29275 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:01:57 +0100
Subject: Fix: Fullscreen regression between release-1.4.0rc2 and
 release-1.4.0rc3 on macOS( #1129)

---
 src/Fl_cocoa.mm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index ae40df446..6e16ac02a 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3284,7 +3284,10 @@ void Fl_Cocoa_Window_Driver::fullscreen_on() {
 #  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     NSWindow *nswin = fl_xid(pWindow);
 #    if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
-       if (fl_mac_os_version >= 101300) nswin = [[nswin tabGroup] selectedWindow];
+    if (fl_mac_os_version >= 101300) {
+      NSWindow *active_tab = [[nswin tabGroup] selectedWindow];
+      if (active_tab) nswin = active_tab;
+    }
 #    endif
     [nswin toggleFullScreen:nil];
 #  endif
@@ -3375,7 +3378,10 @@ void Fl_Cocoa_Window_Driver::fullscreen_off(int X, int Y, int W, int H) {
 #  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     NSWindow *nswin = fl_xid(pWindow);
 #    if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
-       if (fl_mac_os_version >= 101300) nswin = [[nswin tabGroup] selectedWindow];
+    if (fl_mac_os_version >= 101300) {
+      NSWindow *active_tab = [[nswin tabGroup] selectedWindow];
+      if (active_tab) nswin = active_tab;
+    }
 #    endif
     [nswin toggleFullScreen:nil];
 #  endif
-- 
cgit v1.2.3