Merge branch 'v0.20.x'

NEWS

@@ -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

src/db/plugins/simple/DirectorySave.cxx

@@ -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)