keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'cema-sp-master' into develop

This commit is contained in:
antelle 2017-01-28 23:16:41 +01:00
parent 2602a50b80 71c5c7ad40
commit a29688c1a5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/app.js
View File

@ -9,6 +9,7 @@ var mainWindow = null,
appIcon = null,
openFile = process.argv.filter(arg => /\.kdbx$/i.test(arg))[0],
ready = false,
appReady = false,
restartPending = false,
mainWindowPosition = {},
updateMainWindowPositionTimeout = null,
@ -41,6 +42,7 @@ app.on('window-all-closed', () => {
});
app.on('ready', () => {
if (!checkSingleInstance()) {
appReady = true;
setAppOptions();
createMainWindow();
setGlobalShortcuts();
@ -54,7 +56,7 @@ app.on('open-file', (e, path) => {
});
app.on('activate', () => {
if (process.platform === 'darwin') {
if (!mainWindow) {
if (appReady && !mainWindow) {
createMainWindow();
}
}