mirror of https://github.com/keeweb/keeweb
fix #1275: starting the app after closing on macOS
parent
113db1c97d
commit
9a8f595514
|
@ -50,6 +50,8 @@ app.setPath('userData', path.join(tempUserDataPath, tempUserDataPathRand));
|
|||
setEnv();
|
||||
restorePreferences();
|
||||
|
||||
const appSettings = readAppSettings() || {};
|
||||
|
||||
app.on('window-all-closed', () => {
|
||||
if (restartPending) {
|
||||
app.relaunch();
|
||||
|
@ -62,11 +64,10 @@ app.on('window-all-closed', () => {
|
|||
});
|
||||
app.on('ready', () => {
|
||||
appReady = true;
|
||||
const appSettings = readAppSettings() || {};
|
||||
setAppOptions();
|
||||
setSystemAppearance();
|
||||
createMainWindow(appSettings);
|
||||
setGlobalShortcuts(appSettings);
|
||||
createMainWindow();
|
||||
setGlobalShortcuts();
|
||||
subscribePowerEvents();
|
||||
deleteOldTempFiles();
|
||||
hookRequestHeaders();
|
||||
|
@ -154,7 +155,7 @@ function setSystemAppearance() {
|
|||
}
|
||||
}
|
||||
|
||||
function createMainWindow(appSettings) {
|
||||
function createMainWindow() {
|
||||
const windowOptions = {
|
||||
show: false,
|
||||
width: 1000,
|
||||
|
@ -394,7 +395,7 @@ function notifyOpenFile() {
|
|||
}
|
||||
}
|
||||
|
||||
function setGlobalShortcuts(appSettings) {
|
||||
function setGlobalShortcuts() {
|
||||
const defaultShortcutModifiers = process.platform === 'darwin' ? 'Ctrl+Alt+' : 'Shift+Alt+';
|
||||
const defaultShortcuts = {
|
||||
CopyPassword: { shortcut: defaultShortcutModifiers + 'C', event: 'copy-password' },
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
Release notes
|
||||
-------------
|
||||
##### v1.11.3 (2019-09-29)
|
||||
`-` fix #1275: starting the app after closing on macOS
|
||||
|
||||
##### v1.11.2 (2019-09-29)
|
||||
`-` fix #1272: Argon2 error
|
||||
`-` fixed Dropbox connection on iOS 13 homescreen
|
||||
|
|
Loading…
Reference in New Issue