macosx: preserve fullscreen state also in native fullscreen mode

should close #10670

modules/gui/macosx/VLCVoutWindowController.m

@@ -235,6 +235,12 @@
         return;
     }
 
+    [[o_window videoView] releaseVoutThread];
+
+    // set active video to no BEFORE closing the window and exiting fullscreen
+    // (avoid stopping playback due to NSWindowWillCloseNotification, preserving fullscreen state)
+    [o_window setHasActiveVideo: NO];
+
     // prevent visible extra window if in fullscreen
     NSDisableScreenUpdates();
     BOOL b_native = [[VLCMainWindow sharedInstance] nativeFullscreenMode];
@@ -249,12 +255,6 @@
         [o_window toggleFullScreen:self];
     }
 
-    [[o_window videoView] releaseVoutThread];
-
-    // set active video to no BEFORE closing the window to avoid stopping playback
-    // due to NSWindowWillCloseNotification
-    [o_window setHasActiveVideo: NO];
-
     if ([o_window class] != [VLCMainWindow class]) {
         [o_window close];
     }

modules/gui/macosx/Windows.m

@@ -786,9 +786,9 @@
     b_in_fullscreen_transition = YES;
     [self setFullscreen: NO];
 
-    var_SetBool(pl_Get(VLCIntf), "fullscreen", false);
-
     if ([self hasActiveVideo]) {
+        var_SetBool(pl_Get(VLCIntf), "fullscreen", false);
+
         vout_thread_t *p_vout = getVoutForActiveWindow();
         if (p_vout) {
             var_SetBool(p_vout, "fullscreen", false);