Fix minor problem with trayListener

AzzamAlsharafi · Aug 26, 2022 · 0e07ffc · 0e07ffc
1 parent 09c29f5
commit 0e07ffc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/extension.js b/extension.js
@@ -67,7 +67,7 @@ const SystemMenu = GObject.registerClass(
       addOptionsToMenu(this.subMenu.menu);
     }
 
-    destroy(){
+    destroy() {
       this.subMenu.destroy();
       super.destroy();
     }
@@ -99,7 +99,7 @@ function addOptionsToMenu(menu) {
   }
 }
 
-function updateLocation(trayLocation){
+function updateLocation(trayLocation) {
   if (trayLocation) {
     if (systemMenu != null) {
       systemMenu.destroy();
@@ -131,13 +131,15 @@ function enable() {
 
   updateLocation(settings.get_boolean("tray-location"));
 
-  settings.connect("changed::tray-location", () => {
+  trayListener = settings.connect("changed::tray-location", () => {
     updateLocation(settings.get_boolean("tray-location"));
   })
 }
 
 function disable() {
-  settings.disconnect(trayListener);
+  if (trayListener != null) {
+    settings.disconnect(trayListener);
+  }
 
   if (trayMenu != null) {
     trayMenu.destroy();