vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jun 13 21:06:05 2011 +0200| [f6d71f7304f38fb5ab240a9809a609f15650ec85] | committer: Francois Cartegnie
Qt: fix str_format_meta (closes #4777) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6d71f7304f38fb5ab240a9809a609f15650ec85 --- src/text/strings.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/text/strings.c b/src/text/strings.c index 3bc335b..e1d6356 100644 --- a/src/text/strings.c +++ b/src/text/strings.c @@ -905,12 +905,14 @@ char *str_format_meta( vlc_object_t *p_object, const char *string ) if ( now_playing == NULL ) { char *temp = input_item_GetTitleFbName( p_item ); + char *psz_artist = input_item_GetArtist( p_item ); if( !EMPTY_STR( temp ) ) { INSERT_STRING( temp ); - INSERT_STRING_NO_FREE( " - " ); + if ( !EMPTY_STR( psz_artist ) ) + INSERT_STRING_NO_FREE( " - " ); } - INSERT_STRING( input_item_GetArtist( p_item ) ); + INSERT_STRING( psz_artist ); } else INSERT_STRING( now_playing ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
