Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-12-21 10:25:28 +01:00
2 changed files with 8 additions and 3 deletions

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)