Skip to content

Commit 248dffa

Browse files
committed
Delete provider registry actively
Fixes a crash on exit
1 parent 156dc55 commit 248dffa

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/core/qgsapplication.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,8 @@ void QgsApplication::initQgis()
595595
void QgsApplication::exitQgis()
596596
{
597597
delete QgsMapLayerRegistry::instance();
598+
599+
delete QgsProviderRegistry::instance();
598600
}
599601

600602
QString QgsApplication::showSettings()

src/core/qgsproviderregistry.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ typedef QString protocolDrivers_t();
4747

4848
QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )
4949
{
50-
static QgsProviderRegistry mInstance( pluginPath );
51-
return &mInstance;
50+
static QgsProviderRegistry* sInstance( new QgsProviderRegistry( pluginPath ) );
51+
return sInstance;
5252
} // QgsProviderRegistry::instance
5353

5454

0 commit comments

Comments
 (0)