diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 11:46:30 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 11:46:30 +0100 |
| commit | ab9ae1829e51e463d644ff369ebc3434f2f42c81 (patch) | |
| tree | 639b4dc0c0d519fbd2bf99c869b00bce1ccfb5cf /src/index.js | |
| parent | merge-in webview unmounting fix (diff) | |
| parent | Merge pull request #1338 from meetfranz/chore/app-feature-helpers (diff) | |
| download | ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.gz ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.zst ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.zip | |
fix conflicts with latest develop
Diffstat (limited to 'src/index.js')
| -rw-r--r-- | src/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/index.js b/src/index.js index 0e222c3d6..05c793d98 100644 --- a/src/index.js +++ b/src/index.js | |||
| @@ -72,7 +72,10 @@ if (!gotTheLock) { | |||
| 72 | app.on('second-instance', (event, argv) => { | 72 | app.on('second-instance', (event, argv) => { |
| 73 | // Someone tried to run a second instance, we should focus our window. | 73 | // Someone tried to run a second instance, we should focus our window. |
| 74 | if (mainWindow) { | 74 | if (mainWindow) { |
| 75 | if (mainWindow.isMinimized()) mainWindow.restore(); | 75 | mainWindow.show(); |
| 76 | if (mainWindow.isMinimized()) { | ||
| 77 | mainWindow.restore(); | ||
| 78 | } | ||
| 76 | mainWindow.focus(); | 79 | mainWindow.focus(); |
| 77 | 80 | ||
| 78 | if (isWindows) { | 81 | if (isWindows) { |