Mask renderer: fix clone()

Hugo Mercier · Hugo Mercier · commit c1b4fe854562 · 2014-05-23T09:20:34.000+02:00
diff --git a/src/core/symbology-ng/qgsmaskrendererv2.cpp b/src/core/symbology-ng/qgsmaskrendererv2.cpp
@@ -208,8 +208,12 @@ QString QgsMaskRendererV2::dump() const
 
 QgsFeatureRendererV2* QgsMaskRendererV2::clone()
 {
-  QgsMaskRendererV2* r = new QgsMaskRendererV2( mSubRenderer.data() );
-  return r;
+  if ( mSubRenderer.isNull() )
+  {
+    return new QgsMaskRendererV2( 0 );
+  }
+  // else
+  return new QgsMaskRendererV2( mSubRenderer->clone() );
 }
 
 QgsFeatureRendererV2* QgsMaskRendererV2::create( QDomElement& element )

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,12 @@ QString QgsMaskRendererV2::dump() const`
`208`	`208`
`209`	`209`	`QgsFeatureRendererV2* QgsMaskRendererV2::clone()`
`210`	`210`	`{`
`211`		`- QgsMaskRendererV2* r = new QgsMaskRendererV2( mSubRenderer.data() );`
`212`		`- return r;`
	`211`	`+ if ( mSubRenderer.isNull() )`
	`212`	`+ {`
	`213`	`+ return new QgsMaskRendererV2( 0 );`
	`214`	`+ }`
	`215`	`+ // else`
	`216`	`+ return new QgsMaskRendererV2( mSubRenderer->clone() );`
`213`	`217`	`}`
`214`	`218`
`215`	`219`	`QgsFeatureRendererV2* QgsMaskRendererV2::create( QDomElement& element )`