Skip to content

Commit

Permalink
Fix merge conflict with #4619
Browse files Browse the repository at this point in the history
  • Loading branch information
scottnonnenberg-signal committed Feb 4, 2021
1 parent b252aa7 commit 6f861e0
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions main.js
Expand Up @@ -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();
}
});
Expand Down

0 comments on commit 6f861e0

Please sign in to comment.