[Mplayer-cvslog] CVS: main playtreeparser.c,1.30,1.31

Alexander Strasser beastd syncmail at mplayerhq.hu
Fri Sep 10 22:53:25 CEST 2004


CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv26068

Modified Files:
	playtreeparser.c 
Log Message:
Don't prepend basepath to a full unix path. ( 10l to Joey. )


Index: playtreeparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/playtreeparser.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- playtreeparser.c	12 Aug 2004 22:33:21 -0000	1.30
+++ playtreeparser.c	10 Sep 2004 20:53:22 -0000	1.31
@@ -624,8 +624,9 @@
 
   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] == '\\') {




More information about the MPlayer-cvslog mailing list