diff --git a/src/renderer/store/TimelineSpace.ts b/src/renderer/store/TimelineSpace.ts index b0e9957d..b37dabdf 100644 --- a/src/renderer/store/TimelineSpace.ts +++ b/src/renderer/store/TimelineSpace.ts @@ -188,7 +188,7 @@ const actions: ActionTree = { // ----------------------------------------------- // Shortcuts // ----------------------------------------------- - [ACTION_TYPES.WATCH_SHORTCUT_EVENTS]: ({ commit, dispatch }) => { + [ACTION_TYPES.WATCH_SHORTCUT_EVENTS]: ({ commit, dispatch, rootGetters }) => { win.ipcRenderer.on('CmdOrCtrl+N', () => { dispatch('TimelineSpace/Modals/NewToot/openModal', {}, { root: true }) }) @@ -196,7 +196,10 @@ const actions: ActionTree = { commit('TimelineSpace/Modals/Jump/changeModal', true, { root: true }) }) win.ipcRenderer.on('open-shortcuts-list', () => { - commit('TimelineSpace/Modals/Shortcut/changeModal', true, { root: true }) + const modalOpened = rootGetters['TimelineSpace/Modals/modalOpened'] + if (!modalOpened) { + commit('TimelineSpace/Modals/Shortcut/changeModal', true, { root: true }) + } }) }, [ACTION_TYPES.REMOVE_SHORTCUT_EVENTS]: async () => {