Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-07 22:13:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to minimise the window first rather than exiting

Browse source
This commit is contained in:
Germain Souquet 2021-03-25 14:50:33 +00:00
parent 9cdea580d3
commit 3d18ff16d1
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/electron-main.js
View file

@ -927,6 +927,16 @@ app.on('ready', async () => {
mainWindow = global.mainWindow = null;
});
mainWindow.on('close', async (e) => {
// If we are not quitting and have a tray icon then minimize to tray
if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
// On Mac, closing the window just hides it
// (this is generally how single-window Mac apps
// behave, eg. Mail.app)
e.preventDefault();
mainWindow.hide();
return false;
}
if (store.get('warnBeforeExit', true)) {
const shouldCancelCloseRequest = dialog.showMessageBoxSync(mainWindow, {
type: "question",
@ -941,16 +951,6 @@ app.on('ready', async () => {
return false;
}
}
// If we are not quitting and have a tray icon then minimize to tray
if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
// On Mac, closing the window just hides it
// (this is generally how single-window Mac apps
// behave, eg. Mail.app)
e.preventDefault();
mainWindow.hide();
return false;
}
});
if (process.platform === 'win32') {