Tweak legend expression cache invalidation

qgis · Jun 17, 2020 · 2e33642 · 2e33642
1 parent 5d98ad1
commit 2e33642
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/layout/qgslayoutitemlegend.cpp b/src/core/layout/qgslayoutitemlegend.cpp
@@ -867,7 +867,6 @@ void QgsLayoutItemLegend::updateFilterByMap( bool redraw )
   // the actual update will take place before the redraw.
   // This is to avoid multiple calls to the filter
   mFilterAskedForUpdate = true;
-  clearLegendCachedData();
 
   if ( redraw )
     update();
@@ -915,6 +914,7 @@ void QgsLayoutItemLegend::doUpdateFilterByMap()
   else
     mLegendModel->setLegendFilterByMap( nullptr );
 
+  clearLegendCachedData();
   mForceResize = true;
 }
 

diff --git a/src/gui/layout/qgslayoutlegendwidget.cpp b/src/gui/layout/qgslayoutlegendwidget.cpp
@@ -1131,7 +1131,7 @@ void QgsLayoutLegendWidget::mLayerExpressionButton_clicked()
     layerNode->setLabelExpression( expressiondialog.expressionText() );
 
   mLegend->beginCommand( tr( "Update Legend" ) );
-  mLegend->updateLegend();
+  mLegend->refresh();
   mLegend->adjustBoxSize();
   mLegend->endCommand();
 }