fix mesh traces without feedback in the render context (#52266)

qgis-bot · vcloarec · web-flow · commit 6350a8b34b38 · 2023-03-16T13:38:17.000-04:00
Co-authored-by: vcloarec &lt;vcloarec@gmail.com&gt;
diff --git a/src/core/mesh/qgsmeshtracerenderer.cpp b/src/core/mesh/qgsmeshtracerenderer.cpp
@@ -398,7 +398,9 @@ void QgsMeshStreamField::addRandomTraces()
 {
   if ( mMaximumMagnitude > 0 )
     while ( ( mPixelFillingCount < mMaxPixelFillingCount ) &&
-            mRenderContext.feedback() && !mRenderContext.feedback()->isCanceled() )
+            ( !mRenderContext.feedback() ||
+              !mRenderContext.feedback()->isCanceled() ||
+              !mRenderContext.renderingStopped() ) )
       addRandomTrace();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,9 @@ void QgsMeshStreamField::addRandomTraces()`
`398`	`398`	`{`
`399`	`399`	`if ( mMaximumMagnitude > 0 )`
`400`	`400`	`while ( ( mPixelFillingCount < mMaxPixelFillingCount ) &&`
`401`		`- mRenderContext.feedback() && !mRenderContext.feedback()->isCanceled() )`
	`401`	`+ ( !mRenderContext.feedback() \|\|`
	`402`	`+ !mRenderContext.feedback()->isCanceled() \|\|`
	`403`	`+ !mRenderContext.renderingStopped() ) )`
`402`	`404`	`addRandomTrace();`
`403`	`405`	`}`
`404`	`406`