From c9f13438f93dfced3d9cb67abce8ba85f57b442c Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 14 Dec 2022 17:18:52 +1000
Subject: [PATCH] Mark a method as non-fatal due to aggregate calculation
 thread safety issues

---
 src/core/vector/qgsvectorlayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
index 37789576252..d131e8ea34c 100644
--- a/src/core/vector/qgsvectorlayer.cpp
+++ b/src/core/vector/qgsvectorlayer.cpp
@@ -5609,7 +5609,8 @@ void QgsVectorLayer::setAttributeTableConfig( const QgsAttributeTableConfig &att
 
 QgsExpressionContext QgsVectorLayer::createExpressionContext() const
 {
-  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+  // called in a non-thread-safe way in some cases when calculating aggregates in a different thread
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS_NON_FATAL
 
   return QgsExpressionContext( QgsExpressionContextUtils::globalProjectLayerScopes( this ) );
 }