OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Don't `setValue()` if that would lead to setting a `null`/`undefined`
pull/21833/head
James Salter 2021-10-14 09:30:43 +01:00 committed by GitHub
parent ea7257698c 9533f7b0b9
commit 1f7d07ab6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings/handlers/AccountSettingsHandler.ts
View File

@ -118,8 +118,10 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
if (value === null || value === undefined) { if (value === null || value === undefined) {
const oldCombinedValue = settings["autoplayGifsAndVideos"]; const oldCombinedValue = settings["autoplayGifsAndVideos"];
// Write, so that we can remove this in the future // Write, so that we can remove this in the future
if (oldCombinedValue !== null && oldCombinedValue !== undefined) {
this.setValue("autoplayGifs", roomId, oldCombinedValue); this.setValue("autoplayGifs", roomId, oldCombinedValue);
this.setValue("autoplayVideo", roomId, oldCombinedValue); this.setValue("autoplayVideo", roomId, oldCombinedValue);
}
return oldCombinedValue; return oldCombinedValue;
} }
return value; return value;