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/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -104,7 +104,7 @@ inline void
 UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
 {
 	directory.ForEachChildSafe([&](Directory &child){
-			if (DirectoryExists(storage, child))
+			if (child.IsMount() || DirectoryExists(storage, child))
 				return;

 			editor.LockDeleteDirectory(&child);