diff options
author | Stephan Rumswinkel <stnkl@users.noreply.github.com> | 2021-04-04 12:37:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-04 11:37:35 +0100 |
commit | cf0c1a29dd1db194b5355572212bbb5bbed65e52 (patch) | |
tree | 247902ddddc7f92670a86c0819e45ff6d54262d8 | |
parent | New Crowdin updates (#1257) (diff) | |
download | ferdium-app-cf0c1a29dd1db194b5355572212bbb5bbed65e52.tar.gz ferdium-app-cf0c1a29dd1db194b5355572212bbb5bbed65e52.tar.zst ferdium-app-cf0c1a29dd1db194b5355572212bbb5bbed65e52.zip |
Closes #896
-rw-r--r-- | src/index.js | 4 | ||||
-rw-r--r-- | src/stores/AppStore.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/index.js b/src/index.js index b297d66d8..af3172fb1 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -114,7 +114,9 @@ if (!gotTheLock) { | |||
114 | app.on('second-instance', (event, argv) => { | 114 | app.on('second-instance', (event, argv) => { |
115 | // Someone tried to run a second instance, we should focus our window. | 115 | // Someone tried to run a second instance, we should focus our window. |
116 | if (mainWindow) { | 116 | if (mainWindow) { |
117 | mainWindow.show(); | 117 | if (!mainWindow.isVisible()) { |
118 | mainWindow.show(); | ||
119 | } | ||
118 | if (mainWindow.isMinimized()) { | 120 | if (mainWindow.isMinimized()) { |
119 | mainWindow.restore(); | 121 | mainWindow.restore(); |
120 | } | 122 | } |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 869cfa9d6..529201df5 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -333,7 +333,9 @@ export default class AppStore extends Store { | |||
333 | this.actions.service.setActive({ | 333 | this.actions.service.setActive({ |
334 | serviceId, | 334 | serviceId, |
335 | }); | 335 | }); |
336 | mainWindow.show(); | 336 | if (!app.mainWindow.isVisible()) { |
337 | mainWindow.show(); | ||
338 | } | ||
337 | if (app.mainWindow.isMinimized()) { | 339 | if (app.mainWindow.isMinimized()) { |
338 | mainWindow.restore(); | 340 | mainWindow.restore(); |
339 | } | 341 | } |