diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
| commit | 447e4d3583d3394a25f0fb186f50cea45dd7f797 (patch) | |
| tree | dfbafa9caaef9cc203cd6dde2b090d47d847ae1d /src/update_walk.c | |
| parent | 33bf6c09787033597588e96a6530d5c04b5eb166 (diff) | |
| parent | 7df1a2c77d7f0ac2073d3fe9c7ff85dc4a28e12a (diff) | |
| download | mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.gz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.xz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.zip | |
Merged release 0.15.5 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/flac_plugin.c
src/update.c
Diffstat (limited to '')
| -rw-r--r-- | src/update_walk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/update_walk.c b/src/update_walk.c index 660640a67..bf6b0ef15 100644 --- a/src/update_walk.c +++ b/src/update_walk.c @@ -472,20 +472,20 @@ update_container_file( struct directory* directory, while ((vtrack = plugin->container_scan(pathname, ++tnum)) != NULL) { struct song* song = song_file_new(vtrack, contdir); - if (song == NULL) - return true; + char *child_path_fs; // shouldn't be necessary but it's there.. song->mtime = st->st_mtime; - song->tag = plugin->tag_dup(map_directory_child_fs(contdir, vtrack)); + child_path_fs = map_directory_child_fs(contdir, vtrack); + g_free(vtrack); + + song->tag = plugin->tag_dup(child_path_fs); + g_free(child_path_fs); songvec_add(&contdir->songs, song); - song = NULL; modified = true; - - g_free(vtrack); } g_free(pathname); |