Delete provider registry actively

m-kuhn · m-kuhn · commit 248dffab282c · 2014-05-12T16:48:06.000+02:00
Fixes a crash on exit
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
 
 

Original file line number	Diff line number	Diff line change
`@@ -595,6 +595,8 @@ void QgsApplication::initQgis()`
`595`	`595`	`void QgsApplication::exitQgis()`
`596`	`596`	`{`
`597`	`597`	`delete QgsMapLayerRegistry::instance();`
	`598`	`+`
	`599`	`+ delete QgsProviderRegistry::instance();`
`598`	`600`	`}`
`599`	`601`
`600`	`602`	`QString QgsApplication::showSettings()`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ typedef QString protocolDrivers_t();`
`47`	`47`
`48`	`48`	`QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )`
`49`	`49`	`{`
`50`		`- static QgsProviderRegistry mInstance( pluginPath );`
`51`		`- return &mInstance;`
	`50`	`+ static QgsProviderRegistry* sInstance( new QgsProviderRegistry( pluginPath ) );`
	`51`	`+ return sInstance;`
`52`	`52`	`} // QgsProviderRegistry::instance`
`53`	`53`
`54`	`54`