From 1eb80721fd30e50369e64d87f84be34dae6c68bd Mon Sep 17 00:00:00 2001
From: Sadetdin EYILI <sad270@users.noreply.github.com>
Date: Wed, 8 Sep 2021 00:28:44 +0200
Subject: fix: black screen in macOS when closing to systray in fullscreen mode
 (#1883)

fixes #1878
---
 CHANGELOG.md | 4 ++++
 src/index.js | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5085cda9..e69db8440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 - Add a confirmation dialog and a preference while quitting Ferdi (#1879) 💖 @vraravam
 
+### Bug Fixes
+
+- Fix macOS black screen when closing to systray in fullscreen mode (#1878) 💖 @sad270
+
 # [v5.6.1-nightly.52](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.51...v5.6.1-nightly.52) (2021-09-07)
 
 ### Bug Fixes
diff --git a/src/index.js b/src/index.js
index d2b0f56f4..55f58bb56 100644
--- a/src/index.js
+++ b/src/index.js
@@ -280,6 +280,11 @@ const createWindow = () => {
           debug('Skip taskbar: true');
           mainWindow.setSkipTaskbar(true);
         }
+      } else if (isMac && mainWindow.isFullScreen()) {
+        debug('Window: leaveFullScreen and hide');
+        mainWindow.once('show', () => mainWindow.setFullScreen(true));
+        mainWindow.once('leave-full-screen', () => mainWindow.hide());
+        mainWindow.setFullScreen(false);
       } else {
         debug('Window: hide');
         mainWindow.hide();
-- 
cgit v1.2.3-70-g09d2