fix: 341

ThaUnknown · Oct 16, 2023 · 2328c2a · 2328c2a
1 parent 11651cd
commit 2328c2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/renderer/views/Search.svelte b/src/renderer/views/Search.svelte
@@ -34,7 +34,7 @@
 
   let canScroll = true
 
-  async function loadTillFull () {
+  async function loadTillFull (_key) {
     if (!container) return
     const cachedKey = $key
     canScroll = false

diff --git a/src/renderer/views/Settings.svelte b/src/renderer/views/Settings.svelte
@@ -4,7 +4,13 @@
   import { defaults } from '@/../common/util.js'
   export let alToken = localStorage.getItem('ALtoken') || null
 
-  export const set = { ...defaults, ...(JSON.parse(localStorage.getItem('settings')) || {}) }
+  let storedSettings = { ...defaults }
+
+  try {
+    storedSettings = JSON.parse(localStorage.getItem('settings'))
+  } catch (e) {}
+
+  export const set = { ...defaults, ...storedSettings }
   if (set.enableDoH) window.IPC.emit('doh', set.doHURL)
   window.addEventListener('paste', ({ clipboardData }) => {
     if (clipboardData.items?.[0]) {
@@ -110,7 +116,7 @@
   let settings = set
   $: saveSettings(settings)
   $: window.IPC.emit('discord_status', settings.showDetailsInRPC)
-  function saveSettings () {
+  function saveSettings (settings) {
     localStorage.setItem('settings', JSON.stringify(settings))
   }
   function restoreSettings () {