Do not delete the static Settings instance in its own destructor

benni0815 · Aug 4, 2024 · a189118 · a189118
1 parent b81f8fd
commit a189118
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -31,14 +31,10 @@
 #include <QSvgRenderer>
 
 
-Settings* Settings::m_instance = nullptr;
-
 Settings* Settings::instance() 
 {
-    if( !m_instance )
-        m_instance = new Settings();
-
-    return m_instance;
+  static auto settings = Settings();
+  return &settings;
 }
 
 Settings::Settings( QObject *parent )
@@ -55,7 +51,6 @@ Settings::Settings( QObject *parent )
 Settings::~Settings()
 {
     delete m_mutex;
-    delete m_instance;
 }
 
 KCardCache* Settings::cardCache()

diff --git a/src/settings.h b/src/settings.h
@@ -133,8 +133,6 @@ class Settings : public QObject
         Settings( QObject *parent = 0 );
         ~Settings();
 
-        static Settings* m_instance;
-
         KSharedConfig::Ptr m_config;
 
         QMutex* m_mutex;