summaryrefslogtreecommitdiffstats
path: root/playtreeparser.c
diff options
context:
space:
mode:
authoral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-10 20:53:22 +0000
committeral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-10 20:53:22 +0000
commit6c46da99326f8d92395d7e7a3f081a43ff8adfd7 (patch)
tree1ae4411efe50ee735739d58060910c41c1c68afd /playtreeparser.c
parentf1794afafaf47c0badcd48e5787dc98a94b8301a (diff)
downloadmpv-6c46da99326f8d92395d7e7a3f081a43ff8adfd7.tar.bz2
mpv-6c46da99326f8d92395d7e7a3f081a43ff8adfd7.tar.xz
Don't prepend basepath to a full unix path. ( 10l to Joey. )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13306 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'playtreeparser.c')
-rw-r--r--playtreeparser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/playtreeparser.c b/playtreeparser.c
index 153d1948cf..5999fc69f0 100644
--- a/playtreeparser.c
+++ b/playtreeparser.c
@@ -624,8 +624,9 @@ play_tree_add_basepath(play_tree_t* pt, char* bp) {
for(i = 0 ; pt->files[i] != NULL ; i++) {
fl = strlen(pt->files[i]);
- // if we find url:// or X:\ at the beginning, don't mangle it.
- if(fl <= 0 || strstr(pt->files[i],"://") || strstr(pt->files[i],":\\") == pt->files[i] + 1)
+ // if we find a full unix path, url:// or X:\ at the beginning,
+ // don't mangle it.
+ if(fl <= 0 || strstr(pt->files[i],"://") || (strstr(pt->files[i],":\\") == pt->files[i] + 1) || (pt->files[i][0] == '/') )
continue;
// if the path begins with \ then prepend drive letter to it.
if (pt->files[i][0] == '\\') {