Fix windows token login

1 files changed, 26 insertions, 15 deletions

diff --git a/src/index.js b/src/index.js
index 494fa97f1..a2b4acb00 100644
--- a/src/index.js
+++ b/src/index.js
@@ -74,21 +74,22 @@ if (!gotTheLock) {
       mainWindow.focus();
 
       if (isWindows) {
-        // 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);
+        onDidLoad((window) => {
+          // Keep only command line / deep linked arguments
+          const url = argv.slice(1);
+          if (url) {
+            handleDeepLink(window, url.toString());
+          }
+
+          if (argv.includes('--reset-window')) {
+            // Needs to be delayed to not interfere with mainWindow.restore();
+            setTimeout(() => {
+              debug('Resetting windows via Task');
+              window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
+              window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+            }, 1);
+          }
+        });
       }
     }
   });
@@ -174,6 +175,16 @@ const createWindow = () => {
     mainWindow.webContents.openDevTools();
   }
 
+  // Windows deep linking handling on app launch
+  if (isWindows) {
+    onDidLoad((window) => {
+      const url = process.argv.slice(1);
+      if (url) {
+        handleDeepLink(window, url.toString());
+      }
+    });
+  }
+
   // Emitted when the window is closed.
   mainWindow.on('close', (e) => {
     // Dereference the window object, usually you would store windows