singleton lite instantiation is thread safe

kianzarrin · Oct 19, 2022 · d77d1cb · d77d1cb
1 parent 2efa5e8
commit d77d1cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/LoadOrder/CO/SingletonLite.cs b/LoadOrder/CO/SingletonLite.cs
@@ -3,20 +3,22 @@
 
 namespace CO {
     public abstract class SingletonLite<T> where T : new() {
-        private static T sInstance;
-
+        protected static T sInstance;
+        private static object lockObject = new object();
         public static T instance {
             get {
                 if (sInstance == null) {
-                    sInstance = (default(T) == null) ? Activator.CreateInstance<T>() : default(T);
-                    Log.Debug("Creating singleton of type " + typeof(T).Name);
+                    lock (lockObject) {
+                        sInstance = new T();
+                        Log.Debug("Creating singleton of type " + typeof(T).Name);
+                    }
                 }
                 return sInstance;
             }
         }
 
         public static bool exists => sInstance != null;
 
-        public static void Ensure() =>_ = instance;
+        public static void Ensure() => _ = instance;
     }
 }
diff --git a/LoadOrder/CO/settings/GameSettings.cs b/LoadOrder/CO/settings/GameSettings.cs
@@ -82,6 +82,7 @@ public class GameSettings : SingletonLite<GameSettings> {
 
         private static void MonitorSave() {
             try {
+                Log.Info("GameSettings Monitor Started...");
                 while (GameSettings.m_Run) {
                     GameSettings.SaveAll();
                     lock (GameSettings.m_LockObject) {
@@ -96,12 +97,16 @@ public class GameSettings : SingletonLite<GameSettings> {
         }
 
         public GameSettings() {
-            Log.Info("GameSettings Monitor Started...");
-            GameSettings.m_SaveThread = new Thread(new ThreadStart(GameSettings.MonitorSave));
-            GameSettings.m_SaveThread.Name = "SaveSettingsThread";
-            GameSettings.m_SaveThread.IsBackground = true;
-            GameSettings.m_Run = true;
-            GameSettings.m_SaveThread.Start();
+            try {
+                sInstance = this;
+                Log.Info("Creating GameSettings Monitor ...");
+                Log.Debug(Environment.StackTrace);
+                GameSettings.m_SaveThread = new Thread(new ThreadStart(GameSettings.MonitorSave));
+                GameSettings.m_SaveThread.Name = "SaveSettingsThread";
+                GameSettings.m_SaveThread.IsBackground = true;
+                GameSettings.m_Run = true;
+                GameSettings.m_SaveThread.Start();
+            } catch (Exception ex) { ex.Log(); }
         }
 
         ~GameSettings() => Terminate();

diff --git a/LoadOrder/Data/ConfigWrapper.cs b/LoadOrder/Data/ConfigWrapper.cs
@@ -32,6 +32,7 @@ public class ConfigWrapper : SingletonLite<ConfigWrapper> {
         object m_LockObject = new object();
 
         public ConfigWrapper() {
+            sInstance = this;
             var sw = System.Diagnostics.Stopwatch.StartNew();
             Config = LoadOrderConfig.Deserialize(DataLocation.LocalLOMData)
                 ?? new LoadOrderConfig();

diff --git a/Version.props b/Version.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AssemblyVersion>1.12.7.*</AssemblyVersion>
+    <AssemblyVersion>1.12.8.*</AssemblyVersion>
   </PropertyGroup>
 </Project>