From 4d3d091c22b03bc70a53a96161778b0ea191a0ae Mon Sep 17 00:00:00 2001 From: Jochen Keil Date: Mon, 9 Mar 2009 15:10:54 +0100 Subject: Fix remove-flac-song-on-every-update Until now every flac file got removed unconditionally (and then re-added) whenever the update command was issued. Now there is a check if we need to that, so the file will only be removed if there is a embedded cuesheet in that file --- src/update.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/update.c b/src/update.c index 9f3f6c22f..cf0331049 100644 --- a/src/update.c +++ b/src/update.c @@ -447,13 +447,6 @@ update_regular_file(struct directory *directory, const char* pathname = map_directory_child_fs(directory, name); struct directory* contdir = dirvec_find(&directory->children, name); - // is there already a song for this file? - if (song != NULL) - { - delete_song(directory, song); - song = NULL; - } - // directory exists already if (contdir != NULL) { @@ -471,6 +464,13 @@ update_regular_file(struct directory *directory, // contdir doesn't yet exist if (contdir == NULL) { + // is there already a song for this file? + if (song != NULL && (plugin->container_scan(pathname, 1) != NULL)) + { + delete_song(directory, song); + song = NULL; + } + // reset flag if there are no vtracks no_container = true; -- cgit v1.2.3