update electron

bitwarden · Dec 26, 2018 · 58ed2ed · 58ed2ed
1 parent 7a3462a
commit 58ed2ed
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 118 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@types/webcrypto": "0.0.28",
     "@types/zxcvbn": "^4.4.0",
     "concurrently": "3.5.1",
-    "electron": "2.0.11",
+    "electron": "3.0.13",
     "jasmine": "^3.2.0",
     "jasmine-core": "^3.2.1",
     "jasmine-spec-reporter": "^4.2.1",
@@ -74,7 +74,7 @@
     "big-integer": "1.6.36",
     "core-js": "2.5.7",
     "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
-    "electron-log": "2.2.14",
+    "electron-log": "2.2.17",
     "electron-updater": "3.0.3",
     "form-data": "2.3.2",
     "keytar": "4.2.1",

diff --git a/src/electron/window.main.ts b/src/electron/window.main.ts
@@ -24,19 +24,20 @@ export class WindowMain {
         return new Promise((resolve, reject) => {
             try {
                 if (!isMacAppStore() && !isSnapStore()) {
-                    const shouldQuit = app.makeSingleInstance((args, dir) => {
-                        // Someone tried to run a second instance, we should focus our window.
-                        if (this.win != null) {
-                            if (this.win.isMinimized()) {
-                                this.win.restore();
-                            }
-                            this.win.focus();
-                        }
-                    });
-
-                    if (shouldQuit) {
+                    const gotTheLock = app.requestSingleInstanceLock();
+                    if (!gotTheLock) {
                         app.quit();
                         return;
+                    } else {
+                        app.on('second-instance', (event, commandLine, workingDirectory) => {
+                            // Someone tried to run a second instance, we should focus our window.
+                            if (this.win != null) {
+                                if (this.win.isMinimized()) {
+                                    this.win.restore();
+                                }
+                                this.win.focus();
+                            }
+                        });
                     }
                 }