From ad631d563bbbdb4aef8bcaf7f02d009b1bc5d06f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 14 Oct 2013 21:11:20 +0200
Subject: stored_playlist: use fs_charset_to_utf8() for URLs

---
 NEWS                  | 1 +
 src/stored_playlist.c | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4ab825be6..c1acf0fd9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.17.6 (not yet released)
   - alsa: fix busy loop when USB sound device gets unplugged
 * stored playlists:
   - fix loading playlists with references to local files
+  - obey filesystem_charset for URLs
 
 ver 0.17.5 (2013/08/04)
 * protocol:
diff --git a/src/stored_playlist.c b/src/stored_playlist.c
index e84d5e060..86b7ff8c3 100644
--- a/src/stored_playlist.c
+++ b/src/stored_playlist.c
@@ -287,8 +287,11 @@ spl_load(const char *utf8path, GError **error_r)
 				continue;
 
 			s = path_utf8;
-		} else
-			s = g_strdup(s);
+		} else {
+			s = fs_charset_to_utf8(s);
+			if (s == NULL)
+				continue;
+		}
 
 		g_ptr_array_add(list, s);
 
-- 
cgit v1.2.3