Merge branch 'GlobedGD:main' into main

GlobedGD · Jan 10, 2025 · 5903203 · 5903203
2 parents 3687db9 + b1a3b78
commit 5903203
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/managers/settings.hpp b/src/managers/settings.hpp
@@ -8,8 +8,8 @@
 
 #include <util/singleton.hpp>
 
-class GlobedSettings : public SingletonBase<GlobedSettings> {
-    friend class SingletonBase;
+class GlobedSettings : public SingletonLeakBase<GlobedSettings> {
+    friend class SingletonLeakBase;
     GlobedSettings();
 
 public:

diff --git a/src/util/singleton.hpp b/src/util/singleton.hpp
@@ -35,3 +35,24 @@ class SingletonBase {
         destructed = true;
     }
 };
+
+// This is like SingletonBase except not freed during program exit
+template <typename Derived>
+class SingletonLeakBase {
+public:
+    // no copy
+    SingletonLeakBase(const SingletonLeakBase&) = delete;
+    SingletonLeakBase& operator=(const SingletonLeakBase&) = delete;
+    // no move
+    SingletonLeakBase(SingletonLeakBase&&) = delete;
+    SingletonLeakBase& operator=(SingletonLeakBase&&) = delete;
+
+    static Derived& get() {
+        static Derived* instance = new Derived();
+        return *instance;
+    }
+
+
+protected:
+    SingletonLeakBase() {}
+};