Fix identify tool with rule renderer and nested else

qgis · Apr 17, 2018 · a84cdd4 · a84cdd4
1 parent d7fd14b
commit a84cdd4
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/core/symbology/qgsrulebasedrenderer.cpp b/src/core/symbology/qgsrulebasedrenderer.cpp
@@ -549,15 +549,22 @@ bool QgsRuleBasedRenderer::Rule::willRenderFeature( QgsFeature &feat, QgsRenderC
   {
     if ( rule->isElse() )
     {
-      RuleList lst = rulesForFeature( feat, context, false );
-      lst.removeOne( rule );
+      if ( rule->children().isEmpty() )
+      {
+        RuleList lst = rulesForFeature( feat, context, false );
+        lst.removeOne( rule );
 
-      if ( lst.empty() )
+        if ( lst.empty() )
+        {
+          return true;
+        }
+      }
+      else
       {
-        return true;
+        return rule->willRenderFeature( feat, context );
       }
     }
-    else if ( !rule->isElse( ) && rule->willRenderFeature( feat, context ) )
+    else if ( rule->willRenderFeature( feat, context ) )
     {
       return true;
     }