1 files changed, 57 insertions, 23 deletions

diff --git a/src/index.js b/src/index.js
index 830166dcf..75da4ff88 100644
--- a/src/index.js
+++ b/src/index.js
@@ -46,35 +46,69 @@ if (isWindows) {
 }
 
 // Force single window
-const isSecondInstance = app.makeSingleInstance((argv) => {
-  if (mainWindow) {
-    if (mainWindow.isMinimized()) mainWindow.restore();
-    mainWindow.focus();
+const gotTheLock = app.requestSingleInstanceLock();
+if (!gotTheLock) {
+  app.quit();
+} else {
+  app.on('second-instance', (event, argv) => {
+    // Someone tried to run a second instance, we should focus our window.
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) mainWindow.restore();
+      mainWindow.focus();
 
-    if (process.platform === 'win32') {
-      // Keep only command line / deep linked arguments
-      const url = argv.slice(1);
+      if (isWindows) {
+        // Keep only command line / deep linked arguments
+        const url = argv.slice(1);
 
-      if (url) {
-        handleDeepLink(mainWindow, url.toString());
+        if (url) {
+          handleDeepLink(mainWindow, url.toString());
+        }
       }
-    }
-  }
 
-  if (argv.includes('--reset-window')) {
-    // Needs to be delayed to not interfere with mainWindow.restore();
-    setTimeout(() => {
-      debug('Resetting windows via Task');
-      mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-      mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
-    }, 1);
-  }
-});
+      if (argv.includes('--reset-window')) {
+        // Needs to be delayed to not interfere with mainWindow.restore();
+        setTimeout(() => {
+          debug('Resetting windows via Task');
+          mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
+          mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+        }, 1);
+      }
+    }
+  });
 
-if (isSecondInstance) {
-  console.log('An instance of Franz is already running. Exiting...');
-  app.exit();
+  // Create myWindow, load the rest of the app, etc...
+  app.on('ready', () => {
+  });
 }
+// const isSecondInstance = app.makeSingleInstance((argv) => {
+//   if (mainWindow) {
+//     if (mainWindow.isMinimized()) mainWindow.restore();
+//     mainWindow.focus();
+
+//     if (process.platform === 'win32') {
+//       // Keep only command line / deep linked arguments
+//       const url = argv.slice(1);
+
+//       if (url) {
+//         handleDeepLink(mainWindow, url.toString());
+//       }
+//     }
+//   }
+
+//   if (argv.includes('--reset-window')) {
+//     // Needs to be delayed to not interfere with mainWindow.restore();
+//     setTimeout(() => {
+//       debug('Resetting windows via Task');
+//       mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
+//       mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+//     }, 1);
+//   }
+// });
+
+// if (isSecondInstance) {
+//   console.log('An instance of Franz is already running. Exiting...');
+//   app.exit();
+// }
 
 // Fix Unity indicator issue
 // https://github.com/electron/electron/issues/9046