diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp similarity index 61% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp index 92563ca24ac9..bbde70a1a76c 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp @@ -1,19 +1,19 @@ ---- src/core/providers/ogr/qgsogrproviderutils.cpp.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.cpp -@@ -2311,7 +2311,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer +--- src/core/providers/ogr/qgsogrprovider.cpp.orig 2021-11-19 12:10:19 UTC ++++ src/core/providers/ogr/qgsogrprovider.cpp +@@ -5934,7 +5934,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer } -void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds ) +void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds ) { if ( !ds ) return; -@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase +@@ -5942,7 +5942,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase QMutexLocker locker( sGlobalMutex() ); releaseInternal( ds->mIdent, ds->mDs, true ); delete ds; - ds = nullptr; } bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName ) diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h similarity index 67% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h index 472ef5ed8c07..a4979c9e5a9b 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h @@ -1,11 +1,11 @@ ---- src/core/providers/ogr/qgsogrproviderutils.h.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.h -@@ -216,7 +216,7 @@ class CORE_EXPORT QgsOgrProviderUtils +--- src/core/providers/ogr/qgsogrprovider.h.orig 2021-11-19 12:10:19 UTC ++++ src/core/providers/ogr/qgsogrprovider.h +@@ -503,7 +503,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 );