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

Fix for "Mount-Points are purged from database on update/rescan." 

Signed-off-by: FlashSystems <developer@flashsystems.de>
This commit is contained in:
FlashSystems 2017-11-25 12:24:27 +01:00 committed by Max Kellermann
parent 53def9a682
commit 63fc98591d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.20.13 (not yet released) ver 0.20.13 (not yet released)
* database
- simple: don't purge mount points on update/rescan
ver 0.20.12 (2017/11/25) ver 0.20.12 (2017/11/25)
* database * database

2
src/db/plugins/simple/Directory.cxx
View File

@ -109,7 +109,7 @@ Directory::PruneEmpty() noexcept
child != end;) { child != end;) {
child->PruneEmpty(); child->PruneEmpty();
if (child->IsEmpty()) if (child->IsEmpty() && !child->IsMount())
child = children.erase_and_dispose(child, child = children.erase_and_dispose(child,
DeleteDisposer()); DeleteDisposer());
else else

2
src/db/update/Walk.cxx
View File

@ -104,7 +104,7 @@ inline void
UpdateWalk::PurgeDeletedFromDirectory(Directory &directory) UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
{ {
directory.ForEachChildSafe([&](Directory &child){ directory.ForEachChildSafe([&](Directory &child){
if (DirectoryExists(storage, child)) if (child.IsMount() || DirectoryExists(storage, child))
return; return;
editor.LockDeleteDirectory(&child); editor.LockDeleteDirectory(&child);