remove singletons when qt is still initialized; refs #170

2013-04-03 09:23:41 +00:00
parent 0315e93444
commit c7d6f5ac18
3 changed files with 14 additions and 4 deletions
--- a/src/qbrowserlib/settings.hxx
+++ b/src/qbrowserlib/settings.hxx
@@ -39,8 +39,13 @@ namespace qbrowserlib {
      //! Singleton
      static Settings& instance(MimeTypes mimetypes=MimeTypes(), QWidget* p=0,
                                QSettings* settings=0, bool autoWrite=true) {
-        static Settings _instance(mimetypes, p, settings, autoWrite);
-        return _instance;
+        static Settings* _instance
+          (new Settings(mimetypes, p, settings, autoWrite));
+        return *_instance;
+      }
+
+      static void purge() {
+        delete &instance();
      }
      
    private: