Merge branch 'fix-themes-select' into shigusegubu

* fix-themes-select: Fixed mergedConfig misbehaving on first boot lint
2021-06-14 10:58:50 +03:00 · 2021-06-14 10:58:50 +03:00 · 7ab5a1c8f8
commit 7ab5a1c8f8
parent d7700ba944 63c22ad131
2 changed files with 3 additions and 2 deletions
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -97,7 +97,8 @@ const config = {
      const { defaultConfig } = rootGetters
      return {
        ...defaultConfig,
-        ...state
+        // Do not override with undefined
+        ...Object.fromEntries(Object.entries(state).filter(([k, v]) => v !== undefined))
      }
    }
  },