diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-11-05 11:45:52 +0000 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-07 09:23:32 -0600 |
commit | 8371cd6cee123d94b0b4b60b0d5b2d3795338fbe (patch) | |
tree | cbd76742c62ad0d036c724ae754bbbfde358fc66 | |
parent | 893039fa142c6b0188549bda5567d8cb115600fa (diff) |
Resolves: fdo#69645 Parent Node disposed and mpParent pointing to junk
mpParent points the contents of mxParent which is a WeakReference, so
we can check if the WeakReference is still valid before using mpParent
Change-Id: I40424714865e506b8cf27017539795eb834e10d2
(cherry picked from commit 1563162131ae00cd2a33c59349567a7b820dc5db)
Reviewed-on: https://gerrit.libreoffice.org/6584
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | animations/source/animcore/animcore.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 5b83bc0f43a9..77e312f0894e 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -2070,7 +2070,8 @@ void AnimationNode::fireChangeListener() } } - if( mpParent ) + //fdo#69645 use get() on WeakReference of mxParent to test if mpParent is still valid + if( mpParent && mxParent.get().is() ) mpParent->fireChangeListener(); } |