Merge pull request #2 from NullScope/development

Fixed Default settings not being re-applied when returning to the main menu

Author: NullScope

GlobalSuppressions.cs

@@ -0,0 +1,10 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>", Scope = "member", Target = "~M:CotLAutoGraphicsSettings.Plugin.Awake")]
+[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>", Scope = "member", Target = "~M:CotLAutoGraphicsSettings.Plugin.OnEnable")]
+[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>", Scope = "member", Target = "~M:CotLAutoGraphicsSettings.Plugin.OnDisable")]

Patches/GraphicsSettingsPatches.cs

@@ -1,5 +1,6 @@
 using HarmonyLib;
 using Lamb.UI;
+using Lamb.UI.MainMenu;
 
 namespace CotLAutoGraphicsSettings.Patches
 {
@@ -14,6 +15,13 @@ public static void UIManager_Start()
             Plugin.ApplySettings();
         }
 
+        [HarmonyPostfix]
+        [HarmonyPatch(typeof(UIMainMenuController), nameof(UIMainMenuController.Start))]
+        public static void LoadMainMenu_Start()
+        {
+            Plugin.ApplySettings();
+        }
+
         [HarmonyPostfix]
         [HarmonyPatch(typeof(SettingsManager), nameof(SettingsManager.SaveSettings))]
         public static void SettingsManager_SaveSettings()
@@ -40,7 +48,6 @@ public static void SettingsManager_SaveSettings()
         [HarmonyPatch(typeof(LocationManager), nameof(LocationManager.EndLoadLocation))]
         public static void LocationManager_EndLoadLocation(FollowerLocation location)
         {
-            Plugin.Log.LogError(location);
             switch(location)
 			{
                 // These are all called during loading of the Cult Base,

Plugin.cs

@@ -49,11 +49,13 @@ private void OnDisable()
 
         public static SettingsData.GraphicsSettings CloneSettings (SettingsData.GraphicsSettings settings)
 		{
-            var newSettings = new SettingsData.GraphicsSettings(settings);
-            // For some reason the constructor does not copy over the AntiAliasing option, so we set it here.
-            newSettings.AntiAliasing = settings.AntiAliasing;
+			var newSettings = new SettingsData.GraphicsSettings(settings)
+			{
+				// For some reason the constructor does not copy over the AntiAliasing option, so we set it here.
+				AntiAliasing = settings.AntiAliasing
+			};
 
-            return newSettings;
+			return newSettings;
         }
 
         public static void SetupConfig()