Merge branch 'fix-themes-select' into shigusegubu

* fix-themes-select:
  Fixed mergedConfig misbehaving on first boot
  lint
This commit is contained in:
Henry Jameson 2021-06-14 10:58:50 +03:00
commit 7ab5a1c8f8
2 changed files with 3 additions and 2 deletions

View file

@ -97,7 +97,8 @@ const config = {
const { defaultConfig } = rootGetters const { defaultConfig } = rootGetters
return { return {
...defaultConfig, ...defaultConfig,
...state // Do not override with undefined
...Object.fromEntries(Object.entries(state).filter(([k, v]) => v !== undefined))
} }
} }
}, },