Merge pull request #6942 from SimonBrandner/fix/autoplay-setting

Don't `setValue()` if that would lead to setting a `null`/`undefined`
matrix-org · Oct 14, 2021 · 1f7d07a · 1f7d07a
2 parents ea72576 + 9533f7b
commit 1f7d07a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
@@ -118,8 +118,10 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             if (value === null || value === undefined) {
                 const oldCombinedValue = settings["autoplayGifsAndVideos"];
                 // Write, so that we can remove this in the future
-                this.setValue("autoplayGifs", roomId, oldCombinedValue);
-                this.setValue("autoplayVideo", roomId, oldCombinedValue);
+                if (oldCombinedValue !== null && oldCombinedValue !== undefined) {
+                    this.setValue("autoplayGifs", roomId, oldCombinedValue);
+                    this.setValue("autoplayVideo", roomId, oldCombinedValue);
+                }
                 return oldCombinedValue;
             }
             return value;