From 187a8f593316137322c3a861fcc75d62a7d7de61 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 6 Aug 2021 23:34:37 +0200
Subject: [PATCH] Small cleanups & code improvements

---
 src/helpers/saveListView.js |  6 +++++-
 src/views/list/ShowList.vue | 11 ++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/helpers/saveListView.js b/src/helpers/saveListView.js
index cddc5d9a4..b7f735e1e 100644
--- a/src/helpers/saveListView.js
+++ b/src/helpers/saveListView.js
@@ -1,5 +1,9 @@
 export const saveListView = (listId, routeName) => {
-	if(routeName.includes('settings.')) {
+	if (routeName.includes('settings.')) {
+		return
+	}
+
+	if (!listId) {
 		return
 	}
 
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index 7aa084f7f..98c5113cf 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -38,12 +38,10 @@
 </template>
 
 <script>
-import router from '../../router'
-
 import ListModel from '../../models/list'
 import ListService from '../../services/list'
-import {CURRENT_LIST} from '@/store/mutation-types'
-import {getListView} from '@/helpers/saveListView'
+import {CURRENT_LIST} from '../../store/mutation-types'
+import {getListView} from '../../helpers/saveListView'
 import {saveListToHistory} from '../../modules/listHistory'
 
 export default {
@@ -84,9 +82,8 @@ export default {
 	methods: {
 		replaceListView() {
 			const savedListView = getListView(this.$route.params.listId)
-			router.replace({name: savedListView, params: {id: this.$route.params.listId}})
-			console.debug('Replaced list view with ', savedListView)
-			return
+			this.$router.replace({name: savedListView, params: {id: this.$route.params.listId}})
+			console.debug('Replaced list view with', savedListView)
 		},
 		loadList() {
 			if (this.$route.name.includes('.settings.')) {