Merge pull request #245 from h3poteto/iss-244

closes #244 Block changing account when loading timeline
h3poteto · Apr 19, 2018 · 8ea31ee · 8ea31ee
2 parents e0c4953 + 8c23fa6
commit 8ea31ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/renderer/components/TimelineSpace.vue b/src/renderer/components/TimelineSpace.vue
@@ -30,9 +30,11 @@ export default {
     this.initialize()
       .then(() => {
         loading.close()
+        this.$store.commit('GlobalHeader/updateChanging', false)
       })
       .catch(() => {
         loading.close()
+        this.$store.commit('GlobalHeader/updateChanging', false)
       })
   },
   beforeDestroy () {

diff --git a/src/renderer/store/GlobalHeader.js b/src/renderer/store/GlobalHeader.js
@@ -5,14 +5,18 @@ const GlobalHeader = {
   namespaced: true,
   state: {
     defaultActive: '0',
-    accounts: []
+    accounts: [],
+    changing: false
   },
   mutations: {
     changeDefaultActive (state, index) {
       state.defaultActive = index
     },
     updateAccounts (state, accounts) {
       state.accounts = accounts
+    },
+    updateChanging (state, value) {
+      state.changing = value
     }
   },
   actions: {
@@ -30,8 +34,13 @@ const GlobalHeader = {
         })
       })
     },
-    watchShortcutEvents ({ commit }) {
+    watchShortcutEvents ({ state, commit }) {
       ipcRenderer.on('change-account', (event, account) => {
+        if (state.changing) {
+          return null
+        }
+        // changing finish after loading
+        commit('updateChanging', true)
         commit('changeDefaultActive', account.index.toString())
         router.push(`/${account._id}/home`)
       })