From 8bc81f6f16a842ccb9f2dba01165d0c62697736c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 4 Feb 2014 11:37:14 +0000 Subject: Related: fdo#69645 don't know if mxParent could become invalid.. after get and before call through mpParent. Probably can't, but I don't know for sure. Change-Id: Ib40e0709f1966687a37cc5b84bae1d554a5b4474 --- animations/source/animcore/animcore.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'animations') diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 089c868cc60b..3b927ea29472 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -2060,9 +2060,13 @@ void AnimationNode::fireChangeListener() } } - //fdo#69645 use get() on WeakReference of mxParent to test if mpParent is still valid - if( mpParent && mxParent.get().is() ) - mpParent->fireChangeListener(); + //fdo#69645 use WeakReference of mxParent to test if mpParent is still valid + if (mpParent) + { + Reference xGuard(mxParent); + if (xGuard.is()) + mpParent->fireChangeListener(); + } } // -------------------------------------------------------------------- -- cgit