[vlc-devel] commit: Fix a bug in input_item_GetTitleFbName (fix #2701) ( Rémi Duraffort )

git version control git at videolan.org
Tue Apr 28 09:37:33 CEST 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Apr 28 09:36:31 2009 +0200| [fef26f2f88b17e7c0dd3199491de7c76f26c3a98] | committer: Rémi Duraffort 

Fix a bug in input_item_GetTitleFbName (fix #2701)

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

 src/input/item.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/input/item.c b/src/input/item.c
index 864e84a..7ef1138 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -306,13 +306,14 @@ char *input_item_GetTitleFbName( input_item_t *p_item )
 
     if( !p_item->p_meta )
     {
+        psz_ret = p_item->psz_name ? strdup( p_item->psz_name ) : NULL;
         vlc_mutex_unlock( &p_item->lock );
-        return NULL;
+        return psz_ret;
     }
 
-    const char *psz_meta = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
-    if( !EMPTY_STR( psz_meta ) )
-        psz_ret = strdup( psz_meta );
+    const char *psz_title = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
+    if( !EMPTY_STR( psz_title ) )
+        psz_ret = strdup( psz_title );
     else
         psz_ret = p_item->psz_name ? strdup( p_item->psz_name ) : NULL;
 




More information about the vlc-devel mailing list