Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #46408 from rhurlin/master
  • Loading branch information
m-kuhn committed Dec 8, 2021
2 parents be56138 + 567cd59 commit 3f00597
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/core/providers/ogr/qgsogrproviderutils.cpp
Expand Up @@ -2337,15 +2337,14 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer )
}


void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds )
void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds )
{
if ( !ds )
return;

QMutexLocker locker( sGlobalMutex() );
releaseInternal( ds->mIdent, ds->mDs, true );
delete ds;
ds = nullptr;
}

bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName )
Expand Down
2 changes: 1 addition & 1 deletion src/core/providers/ogr/qgsogrproviderutils.h
Expand Up @@ -216,7 +216,7 @@ class CORE_EXPORT QgsOgrProviderUtils
static void release( QgsOgrLayer *&layer );

//! Release a QgsOgrDataset*
static void releaseDataset( QgsOgrDataset *&ds );
static void releaseDataset( QgsOgrDataset *ds );

//! Make sure that the existing pool of opened datasets on dsName is not accessible for new getLayer() attempts
static void invalidateCachedDatasets( const QString &dsName );
Expand Down

0 comments on commit 3f00597

Please sign in to comment.