[vlc-commits] Fix meta title insanity
Ludovic Fauvet
git at videolan.org
Mon Jan 26 19:02:32 CET 2015
vlc/vlc-2.2 | branch: master | Ludovic Fauvet <etix at videolan.org> | Mon Jan 26 18:54:32 2015 +0100| [f2ac2bd276f0cfcfe1c4f6dfe83d7d9a7da14460] | committer: Jean-Baptiste Kempf
Fix meta title insanity
Fix #13642
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 6b8ff472ec575505abc6c265cc062b79d79a5347)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f2ac2bd276f0cfcfe1c4f6dfe83d7d9a7da14460
---
src/text/strings.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/text/strings.c b/src/text/strings.c
index fefc984..5da1b7a 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -774,13 +774,12 @@ char *str_format_meta(input_thread_t *input, const char *s)
break;
{
char *value = input_item_GetNowPlayingFb(item);
- if (value == NULL)
- break;
-
- int ret = fputs(value, stream);
- free(value);
-
- if (ret == EOF)
+ if (value != NULL)
+ {
+ fputs(value, stream);
+ free(value);
+ }
+ else
{
char *title = input_item_GetTitleFbName(item);
More information about the vlc-commits
mailing list