Application termination: fix crash caused by 5288aed when layers are …

…still opened at exit
qgis · Oct 20, 2017 · fc016ec · elpaso · Oct 20, 2017 · rouault
1 parent 6ce4b60
commit fc016ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1317,8 +1317,6 @@ QgisApp::~QgisApp()
   // cancel request for FileOpen events
   QgsApplication::setFileOpenEventReceiver( nullptr );
 
-  delete QgsProject::instance();
-
   delete mPythonUtils;
 
   delete mTray;

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -891,11 +891,13 @@ void QgsApplication::exitQgis()
   //LeakSanitiser noise which hides real issues
   QgsApplication::sendPostedEvents( nullptr, QEvent::DeferredDelete );
 
-  delete QgsProviderRegistry::instance();
-
   //delete all registered functions from expression engine (see above comment)
   QgsExpression::cleanRegisteredFunctions();
 
+  delete QgsProject::instance();
+
+  delete QgsProviderRegistry::instance();
+
   // tear-down GDAL/OGR
   OGRCleanupAll();
   GDALDestroyDriverManager();

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -373,6 +373,10 @@ QgsProject::~QgsProject()
   delete mRelationManager;
   delete mLayerTreeRegistryBridge;
   delete mRootGroup;
+  if ( this == sProject )
+  {
+    sProject = nullptr;
+  }
 }
 
 

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -45,11 +45,19 @@ typedef QString protocolDrivers_t();
 //typedef int dataCapabilities_t();
 //typedef QgsDataItem * dataItem_t(QString);
 
-
+static QMutex mutex;
+static QgsProviderRegistry *sInstance = nullptr;
 
 QgsProviderRegistry *QgsProviderRegistry::instance( const QString &pluginPath )
 {
-  static QgsProviderRegistry *sInstance( new QgsProviderRegistry( pluginPath ) );
+  if ( !sInstance )
+  {
+    QMutexLocker locker( &mutex );
+    if ( !sInstance )
+    {
+      sInstance = new QgsProviderRegistry( pluginPath );
+    }
+  }
   return sInstance;
 } // QgsProviderRegistry::instance
 
@@ -256,6 +264,8 @@ void QgsProviderRegistry::clean()
 QgsProviderRegistry::~QgsProviderRegistry()
 {
   clean();
+  if ( sInstance == this )
+    sInstance = nullptr;
 }