From 7cbf99a58f5407f7b3e8d2fbb5af8cca09c75680 Mon Sep 17 00:00:00 2001
From: Giga <gigabyte5671@gmail.com>
Date: Tue, 19 Sep 2023 13:47:09 +1200
Subject: [PATCH] Only sync bookmarks & control settings between tabs

Only allow bookmarks and control settings to sync between open tabs of the same browser. Disallow for account, avatar, and graphics settings to prevent these settings "fighting".
---
 src/stores/user-store.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/stores/user-store.ts b/src/stores/user-store.ts
index 4f016508..fb3918ca 100644
--- a/src/stores/user-store.ts
+++ b/src/stores/user-store.ts
@@ -88,7 +88,7 @@ export const useUserStore = defineStore("user", {
                 activeModel: defaultActiveAvatarId()
             },
             persistentStorageMedium,
-            { mergeDefaults: true }
+            { mergeDefaults: true, listenToStorageChanges: false }
         ),
         // Graphics configuration.
         graphics: useStorage(
@@ -103,7 +103,7 @@ export const useUserStore = defineStore("user", {
                 cameraBobbing: true
             },
             persistentStorageMedium,
-            { mergeDefaults: true }
+            { mergeDefaults: true, listenToStorageChanges: false }
         ),
         // Information about the logged in account. Refer to Account module.
         account: useStorage(
@@ -124,7 +124,7 @@ export const useUserStore = defineStore("user", {
                 }
             },
             persistentStorageMedium,
-            { mergeDefaults: true }
+            { mergeDefaults: true, listenToStorageChanges: false }
         ),
         // Saved bookmarks.
         bookmarks: useStorage(
@@ -133,10 +133,14 @@ export const useUserStore = defineStore("user", {
                 locations: [] as Array<LocationBookmark>
             },
             persistentStorageMedium,
-            { mergeDefaults: true }
+            { mergeDefaults: true, listenToStorageChanges: true }
         ),
         // Controls.
-        controls: useStorage("userControlSettings", defaultControls, persistentStorageMedium, { mergeDefaults: true })
+        controls: useStorage("userControlSettings",
+            defaultControls,
+            persistentStorageMedium,
+            { mergeDefaults: true, listenToStorageChanges: true }
+        )
     }),
 
     actions: {