[MPlayer-cvslog] r29637 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Wed Sep  2 21:55:24 2009
New Revision: 29637

Log:
10l, fix misplaced check in r29613, for loop detection we must compare
current file name against full name to be added, not current file name
against new base path.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep  2 21:49:10 2009	(r29636)
+++ trunk/mplayer.c	Wed Sep  2 21:55:24 2009	(r29637)
@@ -3243,11 +3243,11 @@ if (mpctx->demuxer && mpctx->demuxer->ty
       {
 	strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
 	temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
+	strcat(temp, playlist_entry);
 	if (!strcmp(temp, filename)) {
 	  free(temp);
 	  continue;
 	}
-	strcat(temp, playlist_entry);
 	play_tree_add_file(entry,temp);
 	mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp);
 	free(temp);