github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

优化

pull/1094/head
lyswhut 2023-01-01 14:16:29 +08:00
parent 8bbc4a3c4a
commit 8a49e32d2a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/utils/index.ts
View File

@ -60,7 +60,7 @@ export const mergeSetting = (originSetting: LX.AppSetting, targetSetting?: Parti
updatedSettingKeys: Array<keyof LX.AppSetting>
updatedSetting: Partial<LX.AppSetting>
} => {
let originSettingCopy: LX.AppSetting = JSON.parse(JSON.stringify(originSetting))
let originSettingCopy: LX.AppSetting = { ...originSetting }
// const defaultVersion = targetSettingCopy.version
const updatedSettingKeys: Array<keyof LX.AppSetting> = []
const updatedSetting: Partial<LX.AppSetting> = {}
@ -114,7 +114,7 @@ export const updateSetting = (setting?: Partial<LX.AppSetting>, isInit: boolean
let originSetting: LX.AppSetting
if (isInit) {
if (setting) setting = migrateSetting(setting)
originSetting = defaultSetting
originSetting = { ...defaultSetting }
} else originSetting = global.lx.appSetting
const result = mergeSetting(originSetting, setting)