Fix WindowManager and Logger singletons initializing

MahBoiDeveloper · Jul 23, 2024 · 00bcb18 · 00bcb18
1 parent a8108ff
commit 00bcb18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/GUI/WindowManager.hpp b/src/GUI/WindowManager.hpp
@@ -13,7 +13,7 @@ class WindowManager final
     inline static QTranslator*         pAppTranslator = nullptr;
     QString WindowName;
 public:
-    inline static std::unique_ptr<WindowManager> Instance = nullptr;
+    inline const static std::unique_ptr<WindowManager> Instance = std::make_unique<WindowManager>();
 
 public: // Methods
     WindowManager();

diff --git a/src/Logger.hpp b/src/Logger.hpp
@@ -12,7 +12,7 @@
 class Logger final
 {
 public: // Data
-    static inline std::unique_ptr<Logger> Instance;
+    inline const static std::unique_ptr<Logger> Instance = std::make_unique<Logger>();
 private:
     std::ofstream LogFile;
 

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -26,9 +26,7 @@ int main(int argc, char *argv[])
     QApplication HotkeyEditor(argc, argv);
 
     // Define logger as a singleton class, that could be used anywhere in project
-    Logger::Instance        = make_unique<Logger>();
-    WindowManager::Instance = make_unique<WindowManager>();
-    CSFParser::Instance     = make_unique<CSFParser>(Config::RESOURCE_FOLDER + "/DataSamples/generalsRU.csf");
+    CSFParser::Instance = make_unique<CSFParser>(Config::RESOURCE_FOLDER + "/DataSamples/generalsRU.csf");
 
     try
     {