Fix crash on exit: delete postgres connection pool before QApplication

m-kuhn · m-kuhn · commit 9a161ac449a2 · 2016-04-12T16:47:36.000+02:00
diff --git a/src/providers/postgres/qgspostgresconnpool.cpp b/src/providers/postgres/qgspostgresconnpool.cpp
@@ -16,11 +16,19 @@
 #include "qgspostgresconnpool.h"
 #include "qgspostgresconn.h"
 
-QgsPostgresConnPool QgsPostgresConnPool::sInstance;
+QgsPostgresConnPool* QgsPostgresConnPool::sInstance = nullptr;
 
 QgsPostgresConnPool* QgsPostgresConnPool::instance()
 {
-  return &sInstance;
+  if ( !sInstance )
+    sInstance = new QgsPostgresConnPool();
+  return sInstance;
+}
+
+void QgsPostgresConnPool::cleanupInstance()
+{
+  delete sInstance;
+  sInstance = nullptr;
 }
 
 QgsPostgresConnPool::QgsPostgresConnPool() : QgsConnectionPool<QgsPostgresConn*, QgsPostgresConnPoolGroup>()
diff --git a/src/providers/postgres/qgspostgresconnpool.h b/src/providers/postgres/qgspostgresconnpool.h
@@ -70,14 +70,16 @@ class QgsPostgresConnPool : public QgsConnectionPool<QgsPostgresConn*, QgsPostgr
   public:
     static QgsPostgresConnPool* instance();
 
+    static void cleanupInstance();
+
   protected:
     Q_DISABLE_COPY( QgsPostgresConnPool )
 
   private:
     QgsPostgresConnPool();
     ~QgsPostgresConnPool();
 
-    static QgsPostgresConnPool sInstance;
+    static QgsPostgresConnPool* sInstance;
 };
 
 
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -4130,6 +4130,10 @@ QGISEXTERN QgsTransaction* createTransaction( const QString& connString )
   return new QgsPostgresTransaction( connString );
 }
 
+QGISEXTERN void cleanupProvider()
+{
+  QgsPostgresConnPool::cleanupInstance();
+}
 
 // ----------
 

Original file line number	Diff line number	Diff line change
`@@ -4130,6 +4130,10 @@ QGISEXTERN QgsTransaction* createTransaction( const QString& connString )`
`4130`	`4130`	`return new QgsPostgresTransaction( connString );`
`4131`	`4131`	`}`
`4132`	`4132`
	`4133`	`+QGISEXTERN void cleanupProvider()`
	`4134`	`+{`
	`4135`	`+ QgsPostgresConnPool::cleanupInstance();`
	`4136`	`+}`
`4133`	`4137`
`4134`	`4138`	`// ----------`
`4135`	`4139`