properly null out and remove ml sources

sakithb · Jan 16, 2024 · ed021cf · ed021cf
1 parent 6b196f9
commit ed021cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -420,6 +420,7 @@ export default class MediaControls extends Extension {
 
     private removePlayer(busName: string) {
         debugLog("Removing player:", busName);
+        this.playerProxies.get(busName)?.onDestroy();
         this.playerProxies.delete(busName);
         this.panelBtn?.updateWidgets(WidgetFlags.MENU_PLAYERS);
         this.setActivePlayer();

diff --git a/src/helpers/shell/PlayerProxy.ts b/src/helpers/shell/PlayerProxy.ts
@@ -385,4 +385,10 @@ export default class PlayerProxy {
 
         listeners.splice(id, 1);
     }
+
+    public onDestroy() {
+        if (this.pollSourceId != null) {
+            GLib.source_remove(this.pollSourceId);
+        }
+    }
 }
diff --git a/src/prefs.ts b/src/prefs.ts
@@ -129,6 +129,12 @@ export default class MediaControlsPreferences extends ExtensionPreferences {
             this.window = null;
             this.settings = null;
             this.builder = null;
+
+            this.generalPage = null;
+            this.panelPage = null;
+            this.positionsPage = null;
+            this.shortcutsPage = null;
+            this.otherPage = null;
         });
     }