Merge pull request #445 from RocketChat/bugfix/fullscreen

Fix bug when closing app in fullscreen
RocketChat · May 14, 2017 · 8aef5c4 · 8aef5c4
2 parents 939f3d7 + 6347112
commit 8aef5c4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/background.custom.js b/src/background.custom.js
@@ -94,7 +94,14 @@ export function afterMainWindow (mainWindow) {
             return;
         }
         event.preventDefault();
-        mainWindow.hide();
+        if (mainWindow.isFullScreen()) {
+            mainWindow.once('leave-full-screen', () => {
+                mainWindow.hide();
+            });
+            mainWindow.setFullScreen(false);
+        } else {
+            mainWindow.hide();
+        }
         mainWindowState.saveState(mainWindow);
     });