oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann 2017-12-21 10:25:28 +01:00
commit ad1d5e8248
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -18,6 +18,10 @@ ver 0.21 (not yet released)
* mixer
- sndio: new mixer plugin
ver 0.20.14 (not yet released)
* database
- simple: fix file corruption in the presence of mount points
ver 0.20.13 (2017/12/18)
* output
- osx: set up ring buffer to hold at least 100ms

7
src/db/plugins/simple/DirectorySave.cxx
View File

@ -83,10 +83,11 @@ directory_save(BufferedOutputStream &os, const Directory &directory)
}
for (const auto &child : directory.children) {
os.Format(DIRECTORY_DIR "%s\n", child.GetName());
if (child.IsMount())
continue;
if (!child.IsMount())
directory_save(os, child);
os.Format(DIRECTORY_DIR "%s\n", child.GetName());
directory_save(os, child);
}
for (const auto &song : directory.songs)