Add another early exit shortcut to legend hit test

qgis · Mar 8, 2023 · e3ffb8d · e3ffb8d
1 parent d1247bc
commit e3ffb8d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp
@@ -116,6 +116,14 @@ void QgsMapHitTest::runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols,
     return;
   }
 
+  // if there's no legend items for this layer, shortcut out early
+  QSet< QString > remainingKeysToFind = r->legendKeys();
+  if ( remainingKeysToFind.empty() )
+  {
+    r->stopRender( context );
+    return;
+  }
+
   QgsFeatureRequest request;
 
   const QString rendererFilterExpression = r->filter( vl->fields() );
@@ -169,8 +177,6 @@ void QgsMapHitTest::runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols,
   usedSymbols.clear();
   usedSymbolsRuleKey.clear();
 
-  QSet< QString > remainingKeysToFind = r->legendKeys();
-
   QgsFeature f;
   while ( fi.nextFeature( f ) )
   {