From 61cc0bef4725d2f89acd0a674d5d856e10c23916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 27 Feb 2023 01:23:26 +0100
Subject: [PATCH] locations: Keep track of launch wait timeouts

Ensure we drop the timeouts on we have to launch the default locations
handlers.
---
 locations.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/locations.js b/locations.js
index 7c2835de5..f8a9829af 100644
--- a/locations.js
+++ b/locations.js
@@ -352,23 +352,35 @@ var LocationAppInfo = GObject.registerClass({
         // workaround this by using the async API in a sync way, but we need to
         // use a timeout to avoid this to hang forever, better than hang the
         // shell.
-        let handler, error;
+        let handler, error, launchMaxWaitId;
         Promise.race([
             this._getHandlerAppAsync(cancellable),
             new Promise((resolve, reject) =>
-                GLib.timeout_add(GLib.PRIORITY_DEFAULT, LAUNCH_HANDLER_MAX_WAIT, () => {
-                    cancellable.cancel();
-                    reject(new GLib.Error(Gio.IOErrorEnum,
-                        Gio.IOErrorEnum.TIMED_OUT,
-                        `Searching for ${this.get_id()} handler took too long`));
-                    return GLib.SOURCE_REMOVE;
-                })
+                (launchMaxWaitId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
+                    LAUNCH_HANDLER_MAX_WAIT, () => {
+                        launchMaxWaitId = 0;
+                        cancellable.cancel();
+                        reject(new GLib.Error(Gio.IOErrorEnum,
+                            Gio.IOErrorEnum.TIMED_OUT,
+                            `Searching for ${this.get_id()} handler took too long`));
+                        return GLib.SOURCE_REMOVE;
+                    }))
             ),
         ]).then(h => (handler = h)).catch(e => (error = e));
 
+        if (this._launchMaxWaitIds === undefined)
+            this._launchMaxWaitIds = new Set();
+
+        this._launchMaxWaitIds.add(launchMaxWaitId);
+
         while (handler === undefined && error === undefined)
             GLib.MainContext.default().iteration(false);
 
+        if (launchMaxWaitId) {
+            GLib.source_remove(launchMaxWaitId);
+            this._launchMaxWaitIds.delete(launchMaxWaitId);
+        }
+
         if (this._handlerApp && error?.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.TIMED_OUT))
             return this._handlerApp;
 
@@ -382,6 +394,8 @@ var LocationAppInfo = GObject.registerClass({
     }
 
     destroy() {
+        this._launchMaxWaitIds.forEach(id => GLib.source_remove(id));
+        this._launchMaxWaitIds = null;
         this.location = null;
         this.icon = null;
         this.name = null;