Mercurial > mplayer.hg

changeset 29595:9e014b68ecb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Wed, 02 Sep 2009 19:55:24 +0000
parents 331320b4557b
children 5d00f377f0ea
files mplayer.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Wed Sep 02 19:49:10 2009 +0000
+++ b/mplayer.c	Wed Sep 02 19:55:24 2009 +0000
@@ -3243,11 +3243,11 @@
       {
 	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);