From 1a2b52707054a5d96b9fdf4db0c96d0e13eccbd0 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 11 May 2025 19:33:06 +0200
Subject: [PATCH] fix: Fixed issue with installing mods and unlock normandy
 preference, b=(closes #7198), c=mods, workspaces

---
 src/browser/app/profile/features.inc                  | 4 ++++
 src/browser/app/profile/privacy.inc                   | 2 +-
 src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs | 8 +-------
 src/zen/workspaces/ZenWorkspaces.mjs                  | 3 +++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/browser/app/profile/features.inc b/src/browser/app/profile/features.inc
index c7f1197d9..b3ea3d0fa 100644
--- a/src/browser/app/profile/features.inc
+++ b/src/browser/app/profile/features.inc
@@ -57,7 +57,11 @@ pref('zen.urlbar.enable-overrides', false);
 
 // Exoerimental: Apply a blend mode to the websites so they can render rounded corners
 // IMPORTANT: Remove once firefox 139 is released
+#ifdef XP_MACOSX
+pref('zen.view.experimental-rounded-view', false);
+#else 
 pref('zen.view.experimental-rounded-view', true);
+#endif
 
 // Glance
 pref('zen.glance.enabled', true);
diff --git a/src/browser/app/profile/privacy.inc b/src/browser/app/profile/privacy.inc
index ede1b3d26..17cb5309c 100644
--- a/src/browser/app/profile/privacy.inc
+++ b/src/browser/app/profile/privacy.inc
@@ -19,7 +19,7 @@ pref("browser.ping-centre.telemetry", false);
 pref("browser.attribution.enabled", false);
 pref("toolkit.telemetry.pioneer-new-studies-available", false);
 pref("app.shield.optoutstudies.enabled", false, locked);
-pref("app.normandy.enabled", false, locked);
+pref("app.normandy.enabled", false);
 pref("app.normandy.api_url", "", locked);
 
 // Crash reports
diff --git a/src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs b/src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs
index 3745d655c..c26f44460 100644
--- a/src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs
+++ b/src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs
@@ -120,13 +120,7 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
   }
 
   async getThemes() {
-    if (!this._themes) {
-      if (!(await IOUtils.exists(this.themesDataFile))) {
-        await IOUtils.writeJSON(this.themesDataFile, {});
-      }
-      this._themes = await IOUtils.readJSON(this.themesDataFile);
-    }
-    return this._themes;
+    return await IOUtils.readJSON(this.themesDataFile);
   }
 
   async updateThemes(themes) {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 8e012d556..69a6837ad 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -3211,6 +3211,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const sortedBrowsers = browsers.sort((a, b) => {
       const aTab = gBrowser.getTabForBrowser(a);
       const bTab = gBrowser.getTabForBrowser(b);
+      if (!bTab || !aTab) {
+        return 0;
+      }
       const aWorkspaceId = aTab.getAttribute('zen-workspace-id');
       const bWorkspaceId = bTab.getAttribute('zen-workspace-id');
       return aWorkspaceId === currentWorkspace ? -1 : bWorkspaceId === currentWorkspace ? 1 : 0;