diff --git a/src/common/utils.js b/src/common/utils.js index 47fee60c..ae274f99 100644 --- a/src/common/utils.js +++ b/src/common/utils.js @@ -173,10 +173,11 @@ exports.initSetting = () => { // 迁移列表滚动位置设置 ~0.18.3 if (setting.list.scroll) { let scroll = setting.list.scroll - electronStore_list.set('defaultList.location', scroll.locations.defaultList || 0) - electronStore_list.set('loveList.location', scroll.locations.loveList || 0) + electronStore_list.set('defaultList.location', scroll.locations.default || 0) + electronStore_list.set('loveList.location', scroll.locations.love || 0) electronStore_config.delete('setting.list.scroll') electronStore_config.set('setting.list.isSaveScrollLocation', scroll.enable) + delete setting.list.scroll } } diff --git a/src/main/rendererEvents/playList.js b/src/main/rendererEvents/playList.js index 32d15aa1..219046da 100644 --- a/src/main/rendererEvents/playList.js +++ b/src/main/rendererEvents/playList.js @@ -2,15 +2,15 @@ const Store = require('electron-store') const { mainOn, NAMES: { mainWindow: ipcMainWindowNames }, mainHandle } = require('../../common/ipc') -const electronStore_list = new Store({ - name: 'playList', -}) +let electronStore_list mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false) => { - let electronStore_list = new Store({ - name: 'playList', - clearInvalidConfig: !isIgnoredError, - }) + if (!electronStore_list) { + electronStore_list = new Store({ + name: 'playList', + clearInvalidConfig: !isIgnoredError, + }) + } return { defaultList: electronStore_list.get('defaultList'), @@ -20,4 +20,4 @@ mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false) } }) -mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => electronStore_list.set(type, data)) +mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => electronStore_list && electronStore_list.set(type, data))