summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-14 21:11:20 +0200
committerMax Kellermann <max@duempel.org>2013-10-14 21:11:20 +0200
commitad631d563bbbdb4aef8bcaf7f02d009b1bc5d06f (patch)
tree7216a12268d32adaba4880e74b31efa3bed0b679
parent7cbaf11ddad6f5b464baed80b80e8c9b62f53d55 (diff)
stored_playlist: use fs_charset_to_utf8() for URLs
-rw-r--r--NEWS1
-rw-r--r--src/stored_playlist.c7
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);