From c47fd80ae8d0d7619cdb21481c0d8663aec030f3 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sat, 17 Jan 2026 12:31:32 -0600
Subject: [PATCH] Fix preset issues

---
 src/components/PresetPicker.vue  |  1 -
 src/components/SettingPicker.vue |  7 ++++++-
 src/components/SettingsPage.vue  | 12 +++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/PresetPicker.vue b/src/components/PresetPicker.vue
index 2d2f810..4dfb4fe 100644
--- a/src/components/PresetPicker.vue
+++ b/src/components/PresetPicker.vue
@@ -28,7 +28,6 @@ export default defineComponent({
   ],
   props: {
     generator: null,
-    prefix: null,
   },
   computed: {
     ...mapState(usePresetStore, {
diff --git a/src/components/SettingPicker.vue b/src/components/SettingPicker.vue
index 53500f2..cade062 100644
--- a/src/components/SettingPicker.vue
+++ b/src/components/SettingPicker.vue
@@ -48,7 +48,12 @@ export default defineComponent({
   async mounted() {
     this.$refs.tips?.forEach(el => new Tooltip(el));
     if (this.settings) {
-      this.selected = await localforage.getItem(`${this.prefix}setting_${this.name}`) ?? this.settings.default;
+      const saved = await localforage.getItem(`${this.prefix}setting_${this.name}`) ?? this.settings.default;
+      if (this.modelValue) {
+        this.selected = this.modelValue;
+      } else {
+        this.selected = saved;
+      }
       this.change();
     }
   },
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index d3206e8..a3b5d5b 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -39,7 +39,7 @@ export default defineComponent({
   computed: {
     settings() {
       return generatorSettings[this.generator];
-    }
+    },
   },
   async mounted() {
     this.modal = new Modal(this.$refs.savePresetModal, {});
@@ -75,10 +75,8 @@ export default defineComponent({
         });
     },
     presetSelected(preset) {
-      for (const setting of Object.keys(this.set)) {
-        if (preset[setting] != undefined) {
-          this.set[setting] = preset[setting];
-        }
+      for (const setting of Object.keys(preset)) {
+        this.set[setting] = preset[setting];
       }
     },
     savePreset(names) {
@@ -143,7 +141,7 @@ export default defineComponent({
   <div id="settings" class="accordion accordion-flush">
     <AccordionItem>
       <PresetPicker ref="preset" :generator="generator" @selected="presetSelected"
-          @save="savePreset" :prefix="prefix" />
+          @save="savePreset" />
     </AccordionItem>
     <AccordionItem :expanded="true">
       <template #header>
@@ -180,7 +178,7 @@ export default defineComponent({
       </template>
       <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
-          v-model="set.lobbies" name="door_lobbies" :generator="generator" :prefix="prefix" />
+          v-model="set.door_lobbies" name="door_lobbies" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
           v-model="set.door_type_mode" name="door_type_mode" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"