[vlc-devel] commit: variables: don't use p_liblvc when we ARE p_libvlc ( Derk-Jan Hartman )

git version control git at videolan.org
Sat Sep 20 19:54:18 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Sat Sep 20 19:57:09 2008 +0200| [06dbb78176fd4e4e9d1d0afec92067b4a590f22a] | committer: Derk-Jan Hartman 

variables: don't use p_liblvc when we ARE p_libvlc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06dbb78176fd4e4e9d1d0afec92067b4a590f22a
---

 src/misc/variables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/misc/variables.c b/src/misc/variables.c
index e70babe..6064ca3 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1459,7 +1459,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
     int i_var;
     variable_t *p_var;
 
-    if( p_this->p_parent || p_this->p_libvlc )
+    if( p_this->p_parent || ( p_this->p_libvlc && p_this != p_this->p_libvlc ) )
     {
         vlc_object_internals_t *p_priv;
 




More information about the vlc-devel mailing list