QGisApp: fix potential crash at application closing linked to mDataSo…

…urceManagerDialog destruction closing GDAL datasets after GDAL has been shut down
qgis · Oct 20, 2017 · 5288aed · 5288aed
1 parent 0f3d14a
commit 5288aed
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1317,15 +1317,19 @@ QgisApp::~QgisApp()
   // cancel request for FileOpen events
   QgsApplication::setFileOpenEventReceiver( nullptr );
 
-  QgsApplication::exitQgis();
-
   delete QgsProject::instance();
 
   delete mPythonUtils;
 
   delete mTray;
 
   delete mDataSourceManagerDialog;
+
+  // This function *MUST* be the last one called, as it destroys in
+  // particular GDAL. As above objects can hold GDAL/OGR objects, it is not
+  // safe destroying them afterwards
+  QgsApplication::exitQgis();
+  // Do *NOT* add anything here !
 }
 
 void QgisApp::dragEnterEvent( QDragEnterEvent *event )