Merge branch 'v0.20.x'

2017-12-03 16:22:08 +01:00
parent 7ba7ce3af7 1208503888
commit fbc4bb29dc
12 changed files with 47 additions and 15 deletions
--- a/src/db/plugins/simple/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -106,7 +106,7 @@ Directory::PruneEmpty() noexcept
 	     child != end;) {
 		child->PruneEmpty();

-		if (child->IsEmpty())
+		if (child->IsEmpty() && !child->IsMount())
 			child = children.erase_and_dispose(child,
 							   DeleteDisposer());
 		else