Skip to content
This repository was archived by the owner on Feb 21, 2022. It is now read-only.

Commit d50225a

Browse files
committed
Handle null theme in stage
1 parent ca560a2 commit d50225a

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

src/App.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export default {
3939
transition: 1500
4040
},
4141
{
42-
// closeBeforeMount: ['login'],
4342
id: 'settings',
4443
openAfterDestroy: ['login']
4544
}

src/store/settings.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,12 @@ export default {
120120
}
121121
},
122122
actions: {
123-
async changeTheme({ dispatch, getters }, theme) {
124-
await dispatch('changeSettings', { key: 'currentTheme', value: theme.name || 'image-' + theme })
123+
async changeTheme({ state, getters, dispatch }, theme) {
124+
const isExistTheme = state.themes.find(({ name }) => name === theme.name)
125+
const finalTheme = isExistTheme ? theme.name || 'image-' + theme : state.themes[0].name
126+
127+
await dispatch('changeSettings', { key: 'currentTheme', value: finalTheme })
128+
125129
const { color } = getters.getCurrentTheme
126130

127131
document.documentElement.style
@@ -156,17 +160,13 @@ export default {
156160

157161
dispatch('changeTheme', { name: local.currentTheme })
158162

159-
let isExistDE = !!lightdm.sessions.filter((item, i) => {
160-
return item.name === local.desktop
161-
}).length;
163+
let isExistDE = lightdm.sessions.find(item => item.name === local.desktop)
162164

163165
if (!isExistDE) {
164166
local.desktop = lightdm.sessions[0].name
165167
}
166168

167-
let isExistUser = !!lightdm.users.filter((item, i) => {
168-
return item.username === local.username
169-
}).length;
169+
let isExistUser = lightdm.users.filter(item => item.username === local.username);
170170

171171
if (!isExistUser) {
172172
local.user = lightdm.users[0].username

0 commit comments

Comments
 (0)