Fix merge conflict with #4619
This commit is contained in:
parent
b252aa788a
commit
6f861e0827
1 changed files with 0 additions and 7 deletions
7
main.js
7
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();
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue