fix: check correct layout when navigating from error

Resolves #7567
nuxt · Jun 23, 2020 · 6332aaa · 6332aaa
1 parent bc6612b
commit 6332aaa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js
@@ -598,7 +598,11 @@ function normalizeComponents (to, ___) {
 <% if (features.layouts) { %>
 function setLayoutForNextPage (to) {
   // Set layout
-  let layout = this.$options.nuxt.err
+  let hasError = Boolean(this.$options.nuxt.err)
+  if (this._hadError && this._dateLastError === this.$options.nuxt.dateErr) {
+    hasError = false
+  }
+  let layout = hasError
     ? (NuxtError.options || NuxtError).layout
     : to.matched[0].components.default.options.layout