mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Fix merge conflict with #4619

Browse source
This commit is contained in:
Scott Nonnenberg 2021-02-04 14:35:06 -08:00
parent b252aa788a
commit 6f861e0827
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.js
View file

@ -1278,13 +1278,6 @@ ipc.on('set-menu-bar-visibility', (event, visibility) => {
ipc.on('close-about', () => { ipc.on('close-about', () => {
if (aboutWindow) { 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(); aboutWindow.close();
} }
}); });