version 11 updates

Author: StorageB

about.js

@@ -1,7 +1,7 @@
 /* about.js */
 
 export const releaseNotes = `
-Version 10 - What's new:
+What's new in this version:
 
 •  Keep toggle state synced with a command's output.
 •  Enable and view detailed logging for setup/troubleshooting.

extension.js

@@ -49,7 +49,7 @@ let buttonClick4 = 2; let buttonClick5 = 2; let buttonClick6 = 2;
 let shortcutId1; let shortcutId2; let shortcutId3; 
 let shortcutId4; let shortcutId5; let shortcutId6;
 
-let checkIntervals = [];
+let checkIntervals = []; let commandTimeouts = [];
 let isRunning = [];
 let debug = false;
 
@@ -786,8 +786,15 @@ export default class CustomQuickToggleExtension extends Extension {
                     return GLib.SOURCE_REMOVE;
                 });
 
+                commandTimeouts.push(timeoutId);
+
                 function cleanup() {
+                    if (didFinish) return;
                     didFinish = true;
+
+                    try { GLib.source_remove(timeoutId); } catch (_) {}
+                    commandTimeouts = commandTimeouts.filter(id => id !== timeoutId);
+
                     try { dataStream.close_async(GLib.PRIORITY_DEFAULT, null, () => {}); } catch (_) {}
                     try { baseStream.close_async(GLib.PRIORITY_DEFAULT, null, () => {}); } catch (_) {}
                 }
@@ -799,7 +806,6 @@ export default class CustomQuickToggleExtension extends Extension {
                         try {
                             const bytes = stream.read_bytes_finish(res);
                             if (bytes.get_size() === 0) {
-                                GLib.source_remove(timeoutId);
                                 const output = new TextDecoder().decode(Uint8Array.from(chunks.flat())).trim();
                                 const match = outputMatches(output, checkRegex);
 
@@ -991,6 +997,12 @@ export default class CustomQuickToggleExtension extends Extension {
         }
         checkIntervals = [];
 
+        for (let id of commandTimeouts) {
+            if (id)
+                GLib.source_remove(id);
+        }
+        commandTimeouts = [];        
+
         this._settings = null;
 
         console.log(`[Custom Command Toggle] Extension disabled`);

metadata.json

@@ -15,5 +15,5 @@
   ],
   "url": "https://github.com/StorageB/custom-command-toggle",
   "uuid": "custom-command-toggle@storageb.github.com",
-  "version": 10
+  "version": 11
 }