[Libreoffice-commits] core.git: animations/source

Caolán McNamara caolanm at redhat.com
Tue Nov 5 12:48:21 CET 2013


 animations/source/animcore/animcore.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1563162131ae00cd2a33c59349567a7b820dc5db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 5 11:45:52 2013 +0000

    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

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 6678893..089c868 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2060,7 +2060,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();
 }
 


More information about the Libreoffice-commits mailing list