Small fix to QgsDataDefined implicit sharing

nyalldawson · nyalldawson · commit 4a4877d34974 · 2015-05-09T17:50:38.000+10:00
diff --git a/src/core/qgsdatadefined.cpp b/src/core/qgsdatadefined.cpp
@@ -210,7 +210,10 @@ bool QgsDataDefined::expressionIsPrepared() const
 
 QgsExpression *QgsDataDefined::expression()
 {
-  d.detach();
+  //Ideally there should be a detach here, but that causes issues
+  //as detaching can create a new expression which will be unprepared
+  //TODO - revisit after QgsExpression is made implicitly shared
+  //d.detach();
   return d->expression;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,10 @@ bool QgsDataDefined::expressionIsPrepared() const`
`210`	`210`
`211`	`211`	`QgsExpression *QgsDataDefined::expression()`
`212`	`212`	`{`
`213`		`- d.detach();`
	`213`	`+ //Ideally there should be a detach here, but that causes issues`
	`214`	`+ //as detaching can create a new expression which will be unprepared`
	`215`	`+ //TODO - revisit after QgsExpression is made implicitly shared`
	`216`	`+ //d.detach();`
`214`	`217`	`return d->expression;`
`215`	`218`	`}`
`216`	`219`