[layouts] Fix crash when opening layout with dynamic image in html label

Fixes #28996
qgis · Sep 19, 2019 · 5db6165 · 5db6165
1 parent f9737a9
commit 5db6165
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/core/layout/qgslayoutitemlabel.cpp b/src/core/layout/qgslayoutitemlabel.cpp
@@ -157,7 +157,10 @@ void QgsLayoutItemLabel::contentChanged()
       //For very basic html labels with no external assets, the html load will already be
       //complete before we even get a chance to start the QEventLoop. Make sure we check
       //this before starting the loop
-      if ( !mHtmlLoaded )
+
+      // important -- we CAN'T do this when it's a render inside the designer, otherwise the
+      // event loop will mess with the paint event and cause it to be deleted, and BOOM!
+      if ( !mHtmlLoaded && ( !mLayout || !mLayout->renderContext().isPreviewRender() ) )
       {
         //Setup event loop and timeout for rendering html
         QEventLoop loop;
@@ -185,6 +188,8 @@ void QgsLayoutItemLabel::loadingHtmlFinished( bool result )
 {
   Q_UNUSED( result )
   mHtmlLoaded = true;
+  invalidateCache();
+  update();
 }
 
 double QgsLayoutItemLabel::htmlUnitsToLayoutUnits()

diff --git a/src/core/layout/qgslayoutrendercontext.h b/src/core/layout/qgslayoutrendercontext.h
@@ -345,6 +345,7 @@ class CORE_EXPORT QgsLayoutRenderContext : public QObject
     friend class TestQgsLayout;
     friend class LayoutContextPreviewSettingRestorer;
     friend class TestQgsLayoutMap;
+    friend class TestQgsLayoutLabel;
 
 };
 

diff --git a/tests/src/core/testqgslayoutlabel.cpp b/tests/src/core/testqgslayoutlabel.cpp
@@ -299,6 +299,7 @@ void TestQgsLayoutLabel::renderAsHtmlRelative()
 {
   QgsLayout l( QgsProject::instance() );
   l.initializeDefaults();
+  l.renderContext().mIsPreviewRender = false;
   QgsLayoutItemLabel *label = new QgsLayoutItemLabel( &l );
   label->setMargin( 1 );
   l.addLayoutItem( label );