diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-06 14:04:57 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-06 14:04:57 +0100 |
commit | c95d6f3d7ad5cf7f46a6fba11f6e57a2b46bc452 (patch) | |
tree | 0dc804b62ad1f8af4c002c612bfe538c94f749e3 /src/index.js | |
parent | Merge pull request #217 from meetfranz/develop (diff) | |
download | ferdium-app-c95d6f3d7ad5cf7f46a6fba11f6e57a2b46bc452.tar.gz ferdium-app-c95d6f3d7ad5cf7f46a6fba11f6e57a2b46bc452.tar.zst ferdium-app-c95d6f3d7ad5cf7f46a6fba11f6e57a2b46bc452.zip |
add debugging output for mainWindow
Diffstat (limited to 'src/index.js')
-rw-r--r-- | src/index.js | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/index.js b/src/index.js index a3aa14732..4507913ad 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -26,19 +26,22 @@ if (isWindows) { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | // Force single window | 28 | // Force single window |
29 | if (process.platform !== 'darwin') { | 29 | // if (process.platform !== 'darwin') { |
30 | const isSecondInstance = app.makeSingleInstance(() => { | 30 | const isSecondInstance = app.makeSingleInstance(() => { |
31 | if (mainWindow) { | 31 | console.log(mainWindow); |
32 | if (mainWindow.isMinimized()) mainWindow.restore(); | 32 | console.log('isMinimized', mainWindow.isMinimized); |
33 | mainWindow.focus(); | 33 | if (mainWindow) { |
34 | } | 34 | if (mainWindow.isMinimized()) mainWindow.restore(); |
35 | }); | 35 | mainWindow.focus(); |
36 | |||
37 | if (isSecondInstance) { | ||
38 | app.quit(); | ||
39 | } | 36 | } |
37 | }); | ||
38 | |||
39 | if (isSecondInstance) { | ||
40 | app.exit(); | ||
40 | } | 41 | } |
41 | 42 | ||
43 | // } | ||
44 | |||
42 | // Initialize Settings | 45 | // Initialize Settings |
43 | const settings = new Settings(); | 46 | const settings = new Settings(); |
44 | 47 | ||
@@ -112,7 +115,7 @@ const createWindow = async () => { | |||
112 | }); | 115 | }); |
113 | 116 | ||
114 | mainWindow.on('close', (e) => { | 117 | mainWindow.on('close', (e) => { |
115 | if (settings.get('minimizeToSystemTray')) { | 118 | if (settings.get('minimizeToSystemTray') && settings.get('runInBackground')) { |
116 | e.preventDefault(); | 119 | e.preventDefault(); |
117 | mainWindow.minimize(); | 120 | mainWindow.minimize(); |
118 | } | 121 | } |