# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1208059639 18000
# Node ID d60f2ae8095910fb0a7a251be77b9909809efbdb
# Parent  539f3cb7b1e8284a017a479f959e3d14ce0be9ba# Parent  413d80f7b0110422dd7e4c7583199ca8952157f2
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 413d80f7b011 -r d60f2ae80959 src/audacious/util.c
--- 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);