Mercurial > audlegacy
changeset 4452:d60f2ae80959
Automated merge with ssh://hg.atheme.org//hg/audacious
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Sat, 12 Apr 2008 23:07:19 -0500 |
parents | 539f3cb7b1e8 (diff) 413d80f7b011 (current diff) |
children | 5a5c8fc27055 |
files | |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/util.c Sat Apr 12 19:30:18 2008 +0200 +++ b/src/audacious/util.c Sat Apr 12 23:07:19 2008 -0500 @@ -1039,7 +1039,10 @@ // case 2: filename is not raw full path nor uri, playlist path is full path // make full path by replacing last part of playlist path with filename. (using g_build_filename) else if (playlist_name[0] == '/' || strstr(playlist_name, "://")) { - path = g_strdup(playlist_name); + path = g_filename_from_uri(playlist_name, NULL, NULL); + if (!path) { + path = g_strdup(playlist_name); + } tmp = strrchr(path, '/'); *tmp = '\0'; tmp = g_build_filename(path, filename, NULL); g_free(path); g_free(filename);