From 415e15f3b150e0ee662447cbffe7340b45f50845 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 11 Jan 2025 21:12:14 +0100
Subject: [PATCH] Fix another issue with temporary mod settings.

---
 Penumbra/Mods/Settings/TemporaryModSettings.cs | 10 ++++++++--
 Penumbra/UI/ModsTab/ModFileSystemSelector.cs   |  6 +++---
 Penumbra/UI/ModsTab/ModPanelSettingsTab.cs     |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Penumbra/Mods/Settings/TemporaryModSettings.cs b/Penumbra/Mods/Settings/TemporaryModSettings.cs
index 425e0348..fa71e1b6 100644
--- a/Penumbra/Mods/Settings/TemporaryModSettings.cs
+++ b/Penumbra/Mods/Settings/TemporaryModSettings.cs
@@ -20,17 +20,23 @@ public sealed class TemporaryModSettings : ModSettings
     public TemporaryModSettings()
     { }
 
-    public TemporaryModSettings(ModSettings? clone, string source, int key = 0)
+    public TemporaryModSettings(Mod mod, ModSettings? clone, string source, int key = 0)
     {
         Source       = source;
         Lock         = key;
         ForceInherit = clone == null;
-        if (clone != null)
+        if (clone != null && clone != Empty)
         {
             Enabled  = clone.Enabled;
             Priority = clone.Priority;
             Settings = clone.Settings.Clone();
         }
+        else
+        {
+            Enabled  = false;
+            Priority = ModPriority.Default;
+            Settings = SettingList.Default(mod);
+        }
     }
 }
 
diff --git a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
index 280956f4..1a7d4e31 100644
--- a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
+++ b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
@@ -277,19 +277,19 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
         var actual = _collectionManager.Active.Current.GetActualSettings(mod.Value.Index).Settings;
         if (actual?.Enabled is true && ImUtf8.MenuItem("Disable Temporarily"u8))
             _collectionManager.Editor.SetTemporarySettings(_collectionManager.Active.Current, mod.Value,
-                new TemporaryModSettings(actual, source) { Enabled = false });
+                new TemporaryModSettings(mod.Value, actual, source) { Enabled = false });
 
         if (actual is not { Enabled: true } && ImUtf8.MenuItem("Enable Temporarily"u8))
         {
             var newSettings = actual is null
                 ? TemporaryModSettings.DefaultSettings(mod.Value, source, true)
-                : new TemporaryModSettings(actual, source) { Enabled = true };
+                : new TemporaryModSettings(mod.Value, actual, source) { Enabled = true };
             _collectionManager.Editor.SetTemporarySettings(_collectionManager.Active.Current, mod.Value, newSettings);
         }
 
         if (tempSettings is null && ImUtf8.MenuItem("Turn Temporary"u8))
             _collectionManager.Editor.SetTemporarySettings(_collectionManager.Active.Current, mod.Value,
-                new TemporaryModSettings(actual, source));
+                new TemporaryModSettings(mod.Value, actual, source));
     }
 
     private void SetDefaultImportFolder(ModFileSystem.Folder folder)
diff --git a/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs b/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
index 2420f06b..c6c155ff 100644
--- a/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
@@ -252,7 +252,7 @@ public class ModPanelSettingsTab(
             var actual = collectionManager.Active.Current.GetActualSettings(selection.Mod!.Index).Settings;
             if (ImUtf8.ButtonEx("Turn Temporary"u8, "Copy the current settings over to temporary settings to experiment with them."u8))
                 collectionManager.Editor.SetTemporarySettings(collectionManager.Active.Current, selection.Mod!,
-                    new TemporaryModSettings(actual, "yourself"));
+                    new TemporaryModSettings(selection.Mod!, actual, "yourself"));
         }
     }
 }