aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-03 00:15:43 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2017-11-03 00:15:43 +0100
commit28e993ee7cdf35019919d14b24408dd42979d8a7 (patch)
treecf9d2b5920f31f98ea9d46d9b4d12709808d3161 /src
parentTest window.show instead of restore (diff)
downloadferdium-app-28e993ee7cdf35019919d14b24408dd42979d8a7.tar.gz
ferdium-app-28e993ee7cdf35019919d14b24408dd42979d8a7.tar.zst
ferdium-app-28e993ee7cdf35019919d14b24408dd42979d8a7.zip
Start from pinned icon
Diffstat (limited to 'src')
-rw-r--r--src/index.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/index.js b/src/index.js
index 361ad59db..a6c7e1d85 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,18 +2,14 @@ import { app, BrowserWindow, shell } from 'electron';
2import fs from 'fs-extra'; 2import fs from 'fs-extra';
3import path from 'path'; 3import path from 'path';
4 4
5/* eslint-disable */
6if (require('electron-squirrel-startup')) app.quit();
7
8import windowStateKeeper from 'electron-window-state'; 5import windowStateKeeper from 'electron-window-state';
9 6
10import { isDevMode, isWindows } from './environment'; 7import { isDevMode, isWindows } from './environment';
11import ipcApi from './electron/ipc-api'; 8import ipcApi from './electron/ipc-api';
12import Tray from './lib/Tray'; 9import Tray from './lib/Tray';
13import Settings from './electron/Settings'; 10import Settings from './electron/Settings';
14import { appId } from './package.json'; 11import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
15import './electron/exception'; 12import './electron/exception';
16/* eslint-enable */
17 13
18// Keep a global reference of the window object, if you don't, the window will 14// Keep a global reference of the window object, if you don't, the window will
19// be closed automatically when the JavaScript object is garbage collected. 15// be closed automatically when the JavaScript object is garbage collected.
@@ -32,9 +28,10 @@ if (isWindows) {
32if (process.platform !== 'darwin') { 28if (process.platform !== 'darwin') {
33 const isSecondInstance = app.makeSingleInstance(() => { 29 const isSecondInstance = app.makeSingleInstance(() => {
34 if (mainWindow) { 30 if (mainWindow) {
35 if (mainWindow.isMinimized()) mainWindow.show(); 31 if (mainWindow.isMinimized()) mainWindow.restore();
36 mainWindow.focus(); 32 mainWindow.focus();
37 } 33 }
34 return true;
38 }); 35 });
39 36
40 if (isSecondInstance) { 37 if (isSecondInstance) {