Merge branch 'v0.21.x'

2020-07-06 20:45:29 +02:00
parent 86823af685 749ad7cd83
commit c3cfb5fe16
27 changed files with 239 additions and 99 deletions
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -322,8 +322,8 @@ UpdateWalk::UpdateDirectory(Directory &directory,

 	try {
 		Mutex mutex;
-		auto is = InputStream::OpenReady(PathTraitsUTF8::Build(storage.MapUTF8(directory.GetPath()),
-								       ".mpdignore").c_str(),
+		auto is = InputStream::OpenReady(storage.MapUTF8(PathTraitsUTF8::Build(directory.GetPath(),
+										       ".mpdignore")).c_str(),
 						 mutex);
 		child_exclude_list.Load(std::move(is));
 	} catch (...) {