From a9dc10b912969de79ab5feab41dda703e4164546 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Fri, 28 Jun 2019 23:54:44 +0900
Subject: [PATCH] refs #921 Wait to change route until change el-menu-item

---
 src/renderer/components/GlobalHeader.vue | 8 +++++++-
 src/renderer/store/GlobalHeader.ts       | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/GlobalHeader.vue b/src/renderer/components/GlobalHeader.vue
index f749e6ec..c0a614b7 100644
--- a/src/renderer/components/GlobalHeader.vue
+++ b/src/renderer/components/GlobalHeader.vue
@@ -11,7 +11,13 @@
       active-text-color="#ffffff"
       role="menubar"
     >
-      <el-menu-item :index="`/${account._id}/home`" v-for="(account, index) in accounts" v-bind:key="account._id" role="menuitem">
+      <el-menu-item
+        :index="`/${account._id}/home`"
+        :route="{ path: `/${account._id}/home` }"
+        v-for="(account, index) in accounts"
+        v-bind:key="account._id"
+        role="menuitem"
+      >
         <i v-if="account.avatar === undefined || account.avatar === null || account.avatar === ''" class="el-icon-menu"></i>
         <FailoverImg v-else :src="account.avatar" class="avatar" :title="account.username + '@' + account.domain" />
         <FailoverImg :src="`${account.baseURL}/favicon.ico`" :failoverSrc="`${account.baseURL}/favicon.png`" class="instance-icon" />
diff --git a/src/renderer/store/GlobalHeader.ts b/src/renderer/store/GlobalHeader.ts
index 3ad7ee89..d0615830 100644
--- a/src/renderer/store/GlobalHeader.ts
+++ b/src/renderer/store/GlobalHeader.ts
@@ -146,7 +146,9 @@ const actions: ActionTree<GlobalHeaderState, RootState> = {
       let notify = createNotification(notification, rootState.App.notify as Notify)
       if (notify) {
         notify.onclick = () => {
-          router.push(`/${id}/notifications`)
+          router.push(`/${id}/home`)
+          // We have to wait until change el-menu-item
+          setTimeout(() => router.push(`/${id}/notifications`), 1000)
         }
       }
     })