Merge pull request #184 from vircadia/fix/localstorage-conflicts

Only sync bookmarks & control settings between tabs.
vircadia · Sep 22, 2023 · b437531 · b437531
2 parents 13b6101 + 5c56673
commit b437531
Showing 1 changed file with 9 additions and 5 deletions.
diff --git 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: {