Browse Source

Partially revert da64582cf3. App.quit should work again.

pull/3202/head
TheGoddessInari 6 years ago
parent
commit
14c71aeae3
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
  1. 8
      electron/main.js
  2. 4
      electron/menu.js
  3. 2
      electron/tray.js
  4. 2
      masterpassword.html

8
electron/main.js

@ -187,7 +187,7 @@ function createWindow () {
mainWindow.minimize(); mainWindow.minimize();
break; break;
case 'quit': case 'quit':
app.exit(); app.quit();
break; break;
} }
break; break;
@ -309,7 +309,7 @@ ipcMain.on('reloadApp', function(event) {
// Relaunch app // Relaunch app
ipcMain.on('relaunchApp', function(event) { ipcMain.on('relaunchApp', function(event) {
app.relaunch(); app.relaunch();
app.exit(0); app.quit(0);
}); });
const haveLock = app.requestSingleInstanceLock(); const haveLock = app.requestSingleInstanceLock();
@ -325,7 +325,7 @@ app.on('second-instance', (commandLine, workingDirectory) => {
}); });
if (!haveLock) { if (!haveLock) {
app.exit(); app.quit();
} }
// Code for downloading images as temporal files // Code for downloading images as temporal files
@ -450,7 +450,7 @@ app.on('window-all-closed', function () {
// On OS X it is common for applications and their menu bar // On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q // to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') { if (process.platform !== 'darwin') {
app.exit(); app.quit();
} }
}); });

4
electron/menu.js

@ -323,7 +323,7 @@ module.exports = function(config) {
{ {
label: locale['tray[1]'], label: locale['tray[1]'],
click() { click() {
app.exit(); app.quit();
} }
} }
] ]
@ -345,7 +345,7 @@ module.exports = function(config) {
label: locale['menu.file[1]'], label: locale['menu.file[1]'],
accelerator: 'CmdOrCtrl+Shift+Q', accelerator: 'CmdOrCtrl+Shift+Q',
click() { click() {
app.exit(); app.quit();
} }
} }
] ]

2
electron/tray.js

@ -27,7 +27,7 @@ exports.create = function(win, config) {
{ {
label: locale['tray[1]'], label: locale['tray[1]'],
click() { click() {
app.exit(); app.quit();
} }
} }
]); ]);

2
masterpassword.html

@ -25,7 +25,7 @@
return doValidate({ keyCode: 13 }, document.getElementsByTagName('input')[0].value); return doValidate({ keyCode: 13 }, document.getElementsByTagName('input')[0].value);
} }
function exit() { function exit() {
require('electron').remote.app.exit(); require('electron').remote.app.quit();
} }
</script> </script>
</body> </body>

Loading…
Cancel
Save