[vlc-devel] commit: Revert "variables: Inherit path is now parent->libvlc->saved config " (Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Fri Sep 19 23:53:52 2008 +0200| [875fa514816eb74393e2674f8725c22bb73e3dd2] | committer: Derk-Jan Hartman 

Revert "variables: Inherit path is now parent->libvlc->saved config"

Deadlocks libvlc, and atm. I do not know how to fix this.
This reverts commit 45e43037a961531a28444d969f903c18929b06b9.

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

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

diff --git a/src/misc/variables.c b/src/misc/variables.c
index c97d8cd..b51c65a 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1453,12 +1453,11 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
 {
     int i_var;
     variable_t *p_var;
-    vlc_object_internals_t *p_priv;
 
     /* No need to take the structure lock,
      * we are only looking for our parents */
 
-    if( !p_this->p_parent && !p_this->p_libvlc )
+    if( !p_this->p_parent )
     {
         switch( i_type & VLC_VAR_CLASS )
         {
@@ -1512,10 +1511,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
         return VLC_SUCCESS;
     }
 
-    if( !p_this->p_parent )
-        p_priv = vlc_internals( p_this->p_libvlc );
-    else
-        p_priv = vlc_internals( p_this->p_parent );
+    vlc_object_internals_t *p_priv = vlc_internals( p_this->p_parent );
 
     /* Look for the variable */
     vlc_mutex_lock( &p_priv->var_lock );