From 718c8cb8d796353565033231e1bd5f8f55e29f05 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Sat, 14 Jun 2014 11:49:40 +0200
Subject: fixed cue charset detection regression

---
 playlist.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'playlist.c')

diff --git a/playlist.c b/playlist.c
index 5be2a779..1d192a3f 100644
--- a/playlist.c
+++ b/playlist.c
@@ -835,11 +835,6 @@ pl_cue_skipspaces (const uint8_t *p) {
 
 static void
 pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset) {
-    if (!charset) {
-        strcpy (out, "<UNRECOGNIZED CHARSET>");
-        return;
-    }
-
     char *str = out;
     if (*p == 0) {
         *out = 0;
@@ -873,6 +868,10 @@ pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset
         *out = 0;
     }
 
+    if (!charset) {
+        return;
+    }
+
     // recode
     int l = strlen (str);
     char recbuf[l*10];
-- 
cgit v1.2.3