From 27c7831c8e55cbefbd76338b2dafb8a37884af61 Mon Sep 17 00:00:00 2001
From: Daniel Khalil <d.khalil@brainsware.at>
Date: Sun, 3 Nov 2019 14:52:04 +0100
Subject: [PATCH] fix: settings tab crashes with third party cookies blocked,
 fixes #1097 #979

---
 packages/app-frontend/src/App.vue                        | 3 ++-
 packages/app-frontend/src/views/settings/SettingsTab.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/app-frontend/src/App.vue b/packages/app-frontend/src/App.vue
index 2f66ac745..6a510854a 100644
--- a/packages/app-frontend/src/App.vue
+++ b/packages/app-frontend/src/App.vue
@@ -169,6 +169,7 @@ import { SPECIAL_TOKENS } from '@utils/util'
 import Keyboard from '@front/mixins/keyboard'
 import GroupDropdown from '@front/components/GroupDropdown.vue'
 import { SETTINGS_VERSION_ID, SETTINGS_VERSION } from '@front/views/settings/SettingsTab.vue'
+import * as storage from '@utils/storage'
 
 export default {
   name: 'App',
@@ -226,7 +227,7 @@ export default {
         { name: 'router', label: 'History', icon: 'directions' },
         { name: 'routes', label: 'Routes', icon: 'book' }
       ],
-      settingsVersion: parseInt(localStorage.getItem(SETTINGS_VERSION_ID))
+      settingsVersion: parseInt(storage.get(SETTINGS_VERSION_ID))
     }
   },
 
diff --git a/packages/app-frontend/src/views/settings/SettingsTab.vue b/packages/app-frontend/src/views/settings/SettingsTab.vue
index 39b3ef656..3f4c89069 100644
--- a/packages/app-frontend/src/views/settings/SettingsTab.vue
+++ b/packages/app-frontend/src/views/settings/SettingsTab.vue
@@ -7,6 +7,7 @@
 <script>
 import GlobalPreferences from './GlobalPreferences.vue'
 import { mapState } from 'vuex'
+import * as storage from '@utils/storage'
 
 export const SETTINGS_VERSION = 3
 export const SETTINGS_VERSION_ID = 'vue-devtools-settings-version'
@@ -17,7 +18,7 @@ export default {
   provide () {
     return {
       settingsVersion: SETTINGS_VERSION,
-      currentSettingsVersion: parseInt(localStorage.getItem(SETTINGS_VERSION_ID)) || 0
+      currentSettingsVersion: parseInt(storage.get(SETTINGS_VERSION_ID, 0))
     }
   },