diff --git a/src/main/index.ts b/src/main/index.ts index d639c4cb..0ec87d42 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -934,11 +934,10 @@ ipcMain.on('change-collapse', (_event: IpcMainEvent, value: boolean) => { }) }) -ipcMain.on('get-collapse', (event: IpcMainEvent) => { +ipcMain.handle('get-collapse', async (_: IpcMainInvokeEvent) => { const preferences = new Preferences(preferencesDBPath) - preferences.load().then(conf => { - event.sender.send('response-get-collapse', conf.state.collapse) - }) + const conf = await preferences.load() + return conf.state.collapse }) ipcMain.on('change-global-header', (event: IpcMainEvent, value: boolean) => { diff --git a/src/renderer/store/TimelineSpace/SideMenu.ts b/src/renderer/store/TimelineSpace/SideMenu.ts index 4b125fab..bc5ccf09 100644 --- a/src/renderer/store/TimelineSpace/SideMenu.ts +++ b/src/renderer/store/TimelineSpace/SideMenu.ts @@ -144,14 +144,10 @@ const actions: ActionTree = { win.ipcRenderer.send('change-collapse', value) commit(MUTATION_TYPES.CHANGE_COLLAPSE, value) }, - readCollapse: ({ commit }) => { - return new Promise(resolve => { - win.ipcRenderer.send('get-collapse') - win.ipcRenderer.once('response-get-collapse', (_, value: boolean) => { - commit(MUTATION_TYPES.CHANGE_COLLAPSE, value) - resolve(value) - }) - }) + readCollapse: async ({ commit }) => { + const value: boolean = await win.ipcRenderer.invoke('get-collapse') + commit(MUTATION_TYPES.CHANGE_COLLAPSE, value) + return value }, listTags: ({ commit }) => { return new Promise((resolve, reject) => {