From b7e4aa38cb13f6978963e08f2537ccd9c2bea09d Mon Sep 17 00:00:00 2001
From: Panu Horsmalahti <phorsmalahti@mirantis.com>
Date: Thu, 10 Dec 2020 15:23:33 +0200
Subject: [PATCH] Fix double handler bug.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
---
 src/main/protocol-handler/router.ts |  2 +-
 src/renderer/bootstrap.tsx          | 30 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/protocol-handler/router.ts b/src/main/protocol-handler/router.ts
index 3030829f36..2c09b58456 100644
--- a/src/main/protocol-handler/router.ts
+++ b/src/main/protocol-handler/router.ts
@@ -68,7 +68,7 @@ export class LensProtocolRouter extends Singleton {
 
   public init() {
     subscribeToBroadcast(lensProtocolChannel, ((_event, { rawUrl }) => {
-      console.log(`receiving: ${rawUrl}`);
+      logger.info(`receiving: ${rawUrl}`);
 
       try {
         this.route(Url(rawUrl, true));
diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index e3859eb286..743284dfe7 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -41,23 +41,27 @@ export async function bootstrap(App: AppComponent) {
   extensionDiscovery.init();
   const lensProtocolRouter = LensProtocolRouter.getInstance<LensProtocolRouter>();
 
-  lensProtocolRouter.init();
-  lensProtocolRouter.onMissingExtension(async name => {
-    if (!extensionLoader.isInstalled(name)) {
-      logger.info(`[PROTOCOL ROUTER]: Extension ${name} not installed, installing..`);
+  logger.info(`[PROTOCOL ROUTER] Calling lensProtocolRouter.init()`);
 
-      await Promise.all([installFromNpm(name), extensionLoader.waitForEnabled(name)]);
+  if (process.isMainFrame) {
+    lensProtocolRouter.init();
+    lensProtocolRouter.onMissingExtension(async name => {
+      if (!extensionLoader.isInstalled(name)) {
+        logger.info(`[PROTOCOL ROUTER]: Extension ${name} not installed, installing..`);
 
-      logger.info(`[PROTOCOL ROUTER]: Extension ${name} installed and enabled.`);
+        await Promise.all([installFromNpm(name), extensionLoader.waitForEnabled(name)]);
 
-      return true;
-    } else {
-      logger.info(`[PROTOCOL ROUTER]: Extension already installed, but route is missing.`);
+        logger.info(`[PROTOCOL ROUTER]: Extension ${name} installed and enabled.`);
 
-      return false;
-    }
-  });
-  protocolEndpoints.registerHandlers();
+        return true;
+      } else {
+        logger.info(`[PROTOCOL ROUTER]: Extension already installed, but route is missing.`);
+
+        return false;
+      }
+    });
+    protocolEndpoints.registerHandlers();
+  }
 
   // preload common stores
   await Promise.all([