[vlc-commits] Fix meta title insanity

Ludovic Fauvet git at videolan.org
Mon Jan 26 19:01:37 CET 2015


vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Mon Jan 26 18:54:32 2015 +0100| [6b8ff472ec575505abc6c265cc062b79d79a5347] | committer: Ludovic Fauvet

Fix meta title insanity

Fix #13642

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 a872a1f..e0fd28c 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