Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #692 from h3poteto/iss-691 

closes #691 Block changing account when the modal is active
This commit is contained in:
AkiraFukushima 2018-11-03 16:23:53 +09:00 committed by GitHub
parent e40b13065a bf05f38b9c
commit ea8b6f87b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/store/GlobalHeader.js
View File

@ -50,7 +50,7 @@ const GlobalHeader = {
}) })
}) })
}, },
watchShortcutEvents ({ state, commit, rootState }) { watchShortcutEvents ({ state, commit, rootState, rootGetters }) {
ipcRenderer.on('change-account', (event, account) => { ipcRenderer.on('change-account', (event, account) => {
if (state.changing) { if (state.changing) {
return null return null
@ -58,6 +58,10 @@ const GlobalHeader = {
if (rootState.route.params.id === account._id) { if (rootState.route.params.id === account._id) {
return null return null
} }
// When the modal window is active, don't change account
if (rootGetters['TimelineSpace/Modals/modalOpened']) {
return null
}
// changing finish after loading // changing finish after loading
commit('updateChanging', true) commit('updateChanging', true)
router.push(`/${account._id}/home`) router.push(`/${account._id}/home`)