From 6f861e082718d350f5435dacaae0e79598586867 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 4 Feb 2021 14:35:06 -0800
Subject: [PATCH] Fix merge conflict with #4619

---
 main.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/main.js b/main.js
index 65deec6d30..7fbc2f8d73 100644
--- a/main.js
+++ b/main.js
@@ -1278,13 +1278,6 @@ ipc.on('set-menu-bar-visibility', (event, visibility) => {
 
 ipc.on('close-about', () => {
   if (aboutWindow) {
-    // Exiting child window when on full screen mode (MacOs only) hides the main window
-    // Fix to issue #4540
-    if (mainWindow.isFullScreen() && OS.isMacOS()) {
-      mainWindow.setFullScreen(false);
-      mainWindow.show();
-      mainWindow.setFullScreen(true);
-    }
     aboutWindow.close();
   }
 });