Avoid some unnecessary work when destructing QgsCoordinateReferenceSy…

…stemPrivate
qgis · Dec 29, 2020 · 97b7ab90f75eb4c24c92061cbaeeaedb33c32d0d · 97b7ab9
1 parent 9a8a8c9
commit 97b7ab90f75eb4c24c92061cbaeeaedb33c32d0d
Unified Split

Showing with 6 additions and 2 deletions.

+6 −2 src/core/qgscoordinatereferencesystem_p.h
diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
@@ -95,8 +95,12 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     ~QgsCoordinateReferenceSystemPrivate()
     {
 #if PROJ_VERSION_MAJOR>=6
-      QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Write );
-      cleanPjObjects();
+      QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Read );
+      if ( !mProjObjects.empty() || mPj )
+      {
+        locker.changeMode( QgsReadWriteLocker::Write );
+        cleanPjObjects();
+      }
 #else
       OSRDestroySpatialReference( mCRS );
 #endif