Explicitly close gdal dataset handles as early as possible

qgis · Oct 25, 2017 · 8eb919e · 8eb919e
1 parent 052688c
commit 8eb919e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp
@@ -311,6 +311,7 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
   }
 
   QStringList sublayers = QgsGdalProvider::subLayers( hDS.get() );
+  hDS.reset();
 
   QgsDebugMsgLevel( "GdalDataset opened " + path, 2 );
 

diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -260,6 +260,7 @@ QList<QgsOgrDbLayerInfo *> QgsOgrLayerItem::subLayers( const QString &path, cons
     {
       QString uri( QStringLiteral( "%1:%2" ).arg( driver, path ) );
       QString name = GDALGetMetadataItem( hDS.get(), "IDENTIFIER", NULL );
+      hDS.reset();
       // Fallback: will not be able to delete the table
       if ( name.isEmpty() )
       {