From 5b291ff768ded0c4d1e23ec0ba7be9b721b2a16a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 6 Jul 2020 17:18:48 +0200
Subject: [PATCH] db/update/Walk: pass concatenated .mpdignore URI to
 storage.MapUTF8()

Fixes the "Unrecognized URI" error with the udisks storage plugin,
which is caused by the kludge in UdisksStorage::MapUTF8().
---
 NEWS                   | 2 ++
 src/db/update/Walk.cxx | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a515aeaad..efc4f0aa6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 ver 0.21.25 (not yet released)
 * protocol:
   - fix crash when using "rangeid" while playing
+* storage
+  - udisks: fix reading ".mpdignore"
 * input
   - file: detect premature end of file
   - smbclient: don't send credentials to MPD clients
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index eb853fcb8..ccc8bb6de 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -341,8 +341,8 @@ UpdateWalk::UpdateDirectory(Directory &directory,
 
 	try {
 		Mutex mutex;
-		auto is = InputStream::OpenReady(PathTraitsUTF8::Build(storage.MapUTF8(directory.GetPath()).c_str(),
-								       ".mpdignore").c_str(),
+		auto is = InputStream::OpenReady(storage.MapUTF8(PathTraitsUTF8::Build(directory.GetPath(),
+										       ".mpdignore").c_str()).c_str(),
 						 mutex);
 		child_exclude_list.Load(std::move(is));
 	} catch (...) {