Save settings properly when game settings are reloaded

nicoco007 · Jul 18, 2020 · 16bc0de · 16bc0de
1 parent 2fec24e
commit 16bc0de
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/Source/CustomAvatar/CustomAvatarsInstaller.cs b/Source/CustomAvatar/CustomAvatarsInstaller.cs
@@ -25,8 +25,8 @@ public override void InstallBindings()
             Container.Bind<ILoggerProvider>().FromMethod((context) => context.Container.Instantiate<IPALoggerProvider>(new object[] { _logger })).AsTransient();
 
             // settings
-            Container.Bind<SettingsManager>().AsSingle();
-            Container.Bind<Settings>().FromMethod((context) => context.Container.Resolve<SettingsManager>().Load()).AsSingle();
+            Container.BindInterfacesAndSelfTo<SettingsManager>().AsSingle();
+            Container.Bind<Settings>().FromMethod((context) => context.Container.Resolve<SettingsManager>().settings);
 
             // managers & helper classes
             Container.BindInterfacesAndSelfTo<PlayerAvatarManager>().AsSingle();

diff --git a/Source/CustomAvatar/Plugin.cs b/Source/CustomAvatar/Plugin.cs
@@ -13,7 +13,6 @@
 using Object = UnityEngine.Object;
 using BeatSaberMarkupLanguage;
 using CustomAvatar.Logging;
-using CustomAvatar.Tracking;
 using HarmonyLib;
 using ILogger = CustomAvatar.Logging.ILogger;
 
@@ -103,8 +102,6 @@ public void OnExit()
 
             SceneManager.sceneLoaded -= OnSceneLoaded;
             SceneManager.sceneUnloaded -= OnSceneUnloaded;
-
-            _settingsManager.Save(_settings);
         }
 
         private void OnSceneLoaded(Scene newScene, LoadSceneMode mode)

diff --git a/Source/CustomAvatar/Utilities/SettingsManager.cs b/Source/CustomAvatar/Utilities/SettingsManager.cs
@@ -7,28 +7,35 @@
 
 namespace CustomAvatar.Utilities
 {
-    internal class SettingsManager
+    internal class SettingsManager : IDisposable
     {
         public readonly string kSettingsPath = Path.Combine(Environment.CurrentDirectory, "UserData", "CustomAvatars.json");
 
-        private bool _hasReset;
+        public Settings settings;
 
         private ILogger _logger;
 
         private SettingsManager(ILoggerProvider loggerProvider)
         {
             _logger = loggerProvider.CreateLogger<SettingsManager>();
+
+            Load();
         }
 
-        public Settings Load()
+        public void Dispose()
+        {
+            Save();
+        }
+
+        public void Load()
         {
             _logger.Info("Loading settings from " + kSettingsPath);
 
             if (!File.Exists(kSettingsPath))
             {
                 _logger.Info("File does not exist, using default settings");
 
-                return new Settings();
+                settings = new Settings();
             }
 
             try
@@ -37,23 +44,20 @@ public Settings Load()
                 using (var jsonReader = new JsonTextReader(reader))
                 {
                     var serializer = GetSerializer();
-                    return serializer.Deserialize<Settings>(jsonReader) ?? new Settings();
+                    settings = serializer.Deserialize<Settings>(jsonReader) ?? new Settings();
                 }
             }
             catch (Exception ex)
             {
                 _logger.Error("Failed to load settings from file; using default settings");
                 _logger.Error(ex);
 
-                _hasReset = true;
-                return new Settings();
+                settings = new Settings();
             }
         }
 
-        public void Save(Settings settings)
+        public void Save()
         {
-            if (_hasReset) return;
-
             foreach (string fileName in settings.avatarSpecificSettings.Keys.ToList())
             {
                 if (!File.Exists(Path.Combine(PlayerAvatarManager.kCustomAvatarsPath, fileName)) || Path.IsPathRooted(fileName))