supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3531 from thelounge/xpaw/ignore-unknown-settings

Browse Source 
Ignore unknown settings
This commit is contained in:
Pavel Djundik 2019-11-26 18:02:09 +02:00 committed by GitHub
commit 5f2651a252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/js/store-settings.js
View File

@ -37,6 +37,11 @@ export function createSettingsStore(store) {
const settingConfig = config[name]; const settingConfig = config[name];
// Trying to update a non existing setting (e.g. server has an old key)
if (!settingConfig) {
return;
}
if ( if (
sync === false && sync === false &&
(state.syncSettings === false || settingConfig.sync === "never") (state.syncSettings === false || settingConfig.sync === "never")
@ -64,7 +69,13 @@ export function createSettingsStore(store) {
} }
function loadFromLocalStorage() { function loadFromLocalStorage() {
const storedSettings = JSON.parse(storage.get("settings")) || false; let storedSettings;
try {
storedSettings = JSON.parse(storage.get("settings"));
} catch (e) {
storage.remove("settings");
}
if (!storedSettings) { if (!storedSettings) {
return {}; return {};