From a4f86d41f89951f9861344fb8ab2096e29173377 Mon Sep 17 00:00:00 2001
From: Artyom Zorin <azorin@zoringroup.com>
Date: Thu, 7 Aug 2025 00:11:11 +0100
Subject: [PATCH] Bump to version 68.5.3

---
 debian/changelog     | 12 ++++++++++++
 src/extension.js     |  9 +++++++++
 src/panelSettings.js |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cb533cd..006098b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gnome-shell-extension-zorin-taskbar (68.5.3) noble; urgency=medium
+
+  * Added workaround for race condition
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Thu, 07 Aug 2025 00:09:07 +0100
+
+gnome-shell-extension-zorin-taskbar (68.5.2) noble; urgency=medium
+
+  * Fixed settings cache issues
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Wed, 06 Aug 2025 23:45:25 +0100
+
 gnome-shell-extension-zorin-taskbar (68.5.1) noble; urgency=medium
 
   * Minor code cleanups
diff --git a/src/extension.js b/src/extension.js
index f9b9da6..c751275 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -58,6 +58,12 @@ export default class ZorinTaskbarExtension extends Extension {
   }
 
   async enable() {
+    // Workaround for race condition in GNOME Shell where enable() may be called multiple times
+    if (this._alreadyEnabled) {
+      return
+    }
+    this._alreadyEnabled = true
+
     DTP_EXTENSION = this
     SETTINGS = this.getSettings('org.gnome.shell.extensions.zorin-taskbar')
     try {
@@ -124,6 +130,7 @@ export default class ZorinTaskbarExtension extends Extension {
     zorinDashDelayId = 0
 
     panelManager?.disable()
+    PanelSettings.clearCache()
 
     DTP_EXTENSION = null
     SETTINGS = null
@@ -140,6 +147,8 @@ export default class ZorinTaskbarExtension extends Extension {
     this.disableGlobalStyles()
 
     AppIcons.resetRecentlyClickedApp()
+
+    this._alreadyEnabled = false
   }
 
   resetGlobalStyles() {
diff --git a/src/panelSettings.js b/src/panelSettings.js
index b8888dd..44e79cf 100644
--- a/src/panelSettings.js
+++ b/src/panelSettings.js
@@ -45,6 +45,7 @@ export var availableMonitors = []
 
 export async function init(settings) {
   useCache = true
+  cache = {}
 
   await setMonitorsInfo(settings)
 }