summaryrefslogtreecommitdiff
path: root/animations
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-04 11:37:14 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-04 12:01:20 +0000
commit8bc81f6f16a842ccb9f2dba01165d0c62697736c (patch)
tree6936f36ee60423d78b1d5493029fc060c06a8910 /animations
parent83beb7738dae52f283b0b5f390ccfc77b4a7c1ac (diff)
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
Diffstat (limited to 'animations')
-rw-r--r--animations/source/animcore/animcore.cxx10
1 files changed, 7 insertions, 3 deletions
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<XInterface> xGuard(mxParent);
+ if (xGuard.is())
+ mpParent->fireChangeListener();
+ }
}
// --------------------------------------------------------------------