[vlc-devel] commit: directory: let' s hope that the directory module is slightly less unstable this way. ( Derk-Jan Hartman )

[git version control]

vlc | branch: 0.9-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Thu Oct  2 23:04:01 2008 +0200| [d69e26a8b459867806392097057711e02284ac61] | committer: Derk-Jan Hartman 

directory: let's hope that the directory module is slightly less unstable this way.

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

 modules/access/directory.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 68fec71..ae7bf4b 100644
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -208,7 +208,6 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
     input_thread_t     *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
 
     playlist_item_t    *p_item_in_category;
-    input_item_t       *p_current_input;
     playlist_item_t    *p_current;
 
     if( !p_input )
@@ -219,8 +218,9 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
         return VLC_ENOOBJ;
     }
 
-    p_current_input = input_GetItem( p_input );
-    p_current = playlist_ItemGetByInput( p_playlist, p_current_input, pl_Unlocked );
+    vlc_mutex_lock( &input_GetItem(p_input)->lock );
+    p_current = playlist_ItemGetByInput( p_playlist, input_GetItem( p_input ), pl_Unlocked );
+    vlc_mutex_unlock( &input_GetItem(p_input)->lock );
 
     if( !p_current )
     {
@@ -260,7 +260,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 
     ReadDir( p_access, p_playlist, psz_name, i_mode,
              p_item_in_category,
-             p_current_input, (DIR *)p_access->p_sys, NULL );
+             p_current->p_input, (DIR *)p_access->p_sys, NULL );
 
     var_SetBool( p_playlist, "intf-change", true );
     playlist_Signal( p_playlist );