Delete provider registry actively

Fixes a crash on exit
qgis · May 12, 2014 · 248dffa · 248dffa
1 parent 156dc55
commit 248dffa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -595,6 +595,8 @@ void QgsApplication::initQgis()
 void QgsApplication::exitQgis()
 {
   delete QgsMapLayerRegistry::instance();
+
+  delete QgsProviderRegistry::instance();
 }
 
 QString QgsApplication::showSettings()

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -47,8 +47,8 @@ typedef QString protocolDrivers_t();
 
 QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )
 {
-  static QgsProviderRegistry mInstance( pluginPath );
-  return &mInstance;
+  static QgsProviderRegistry* sInstance( new QgsProviderRegistry( pluginPath ) );
+  return sInstance;
 } // QgsProviderRegistry::instance