fix: improve disable method and refresh timeout handling

ZanzyTHEbar · Feb 17, 2025 · 16a72d7 · 16a72d7
1 parent dc6ec17
commit 16a72d7
Showing 1 changed file with 33 additions and 27 deletions.
diff --git a/gnome-extension/src/extension.ts b/gnome-extension/src/extension.ts
@@ -40,7 +40,7 @@ export default class VSCodeWorkspacesExtension extends Extension {
 
     private _indicator?: PanelMenu.Button;
     private _refreshInterval: number = 300;
-    private _refreshTimeout: any = null;
+    private _refreshTimeout: number | null = null;
     private _newWindow: boolean = false;
     private _editorLocation: string = '';
     private _preferCodeWorkspaceFile: boolean = false;
@@ -78,7 +78,7 @@ export default class VSCodeWorkspacesExtension extends Extension {
         let iconName = 'code';
         for (const name of this._iconNames) {
             if (this._iconExists(name)) {
-                iconName = iconName;
+                iconName = name;
                 break;
             }
         }
@@ -104,6 +104,26 @@ export default class VSCodeWorkspacesExtension extends Extension {
         this._initializeWorkspaces();
     }
 
+    disable() {
+        if (this._refreshTimeout) {
+            GLib.source_remove(this._refreshTimeout);
+            this._refreshTimeout = null;
+        }
+        if (this._indicator) {
+            this._indicator.destroy();
+            this._indicator = undefined;
+        }
+        this.gsettings = undefined;
+
+        // clean up the cache
+        this._workspaces.clear();
+        this._recentWorkspaces.clear();
+        this._foundEditors = [];
+        this._activeEditor = undefined;
+
+        this._log(`VSCode Workspaces Extension disabled`);
+    }
+
     _initializeWorkspaces() {
         this._log('Initializing workspaces');
         this._workspaces.clear();
@@ -156,32 +176,18 @@ export default class VSCodeWorkspacesExtension extends Extension {
         }
     }
 
-    disable() {
-        if (this._refreshTimeout) {
-            GLib.source_remove(this._refreshTimeout);
-            this._refreshTimeout = null;
-        }
-        if (this._indicator) {
-            this._indicator.destroy();
-            this._indicator = undefined;
-        }
-        this.gsettings = undefined;
-
-        // clean up the cache
-        this._workspaces.clear();
-        this._recentWorkspaces.clear();
-        this._foundEditors = [];
-        this._activeEditor = undefined;
+    _setSettings() {
 
-        this._log(`VSCode Workspaces Extension disabled`);
-    }
+        if (!this.gsettings) {
+            this._log('No GSettings found');
+            return;
+        }
 
-    _setSettings() {
-        this._newWindow = this.gsettings!.get_value('new-window').deepUnpack() ?? false;
-        this._editorLocation = this.gsettings!.get_value('editor-location').deepUnpack() ?? 'auto';
-        this._refreshInterval = this.gsettings!.get_value('refresh-interval').deepUnpack() ?? 300;
-        this._preferCodeWorkspaceFile = this.gsettings!.get_value('prefer-workspace-file').deepUnpack() ?? false;
-        this._debug = this.gsettings!.get_value('debug').deepUnpack() ?? false;
+        this._newWindow = this.gsettings.get_value('new-window').deepUnpack() ?? false;
+        this._editorLocation = this.gsettings.get_value('editor-location').deepUnpack() ?? 'auto';
+        this._refreshInterval = this.gsettings.get_value('refresh-interval').deepUnpack() ?? 300;
+        this._preferCodeWorkspaceFile = this.gsettings.get_value('prefer-workspace-file').deepUnpack() ?? false;
+        this._debug = this.gsettings.get_value('debug').deepUnpack() ?? false;
 
         this._log(`Workspaces Extension enabled`);
         this._log(`New Window: ${this._newWindow}`);
@@ -772,7 +778,7 @@ export default class VSCodeWorkspacesExtension extends Extension {
     }
 
     _startRefresh() {
-        if (this._refreshTimeout) {
+        if (this._refreshTimeout !== null) {
             GLib.source_remove(this._refreshTimeout);
             this._refreshTimeout = null;
         }