From 5e30757d077e3583f05a49515146b75718474e03 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:03:07 +0100
Subject: [PATCH] Move `open-url` handling to first instance block

---
 app/main.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/main.ts b/app/main.ts
index 38892eb23a..592c8cf952 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -270,6 +270,14 @@ if (!process.mas) {
       }
       return true;
     });
+
+    app.on('open-url', (event, incomingHref) => {
+      event.preventDefault();
+      const route = parseSignalRoute(incomingHref);
+      if (route != null) {
+        handleSignalRoute(route);
+      }
+    });
   }
 }
 /* eslint-enable no-console */
@@ -2244,18 +2252,6 @@ app.on(
 app.setAsDefaultProtocolClient('sgnl');
 app.setAsDefaultProtocolClient('signalcaptcha');
 
-app.on('will-finish-launching', () => {
-  // open-url must be set from within will-finish-launching for macOS
-  // https://stackoverflow.com/a/43949291
-  app.on('open-url', (event, incomingHref) => {
-    event.preventDefault();
-    const route = parseSignalRoute(incomingHref);
-    if (route != null) {
-      handleSignalRoute(route);
-    }
-  });
-});
-
 ipc.on(
   'set-badge',
   (_event: Electron.Event, badge: number | 'marked-unread') => {