Merge commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d'

* commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d':
  directory: reuse existing directory if found on update
  song: better handling of existing songs when rereading DB
  tag: merge clearMpdTag into tag_free
  song: start avoiding race in updateSongInfo
  command: get rid of specialized list handlers
  directory: simplify list update handling logic
  main_notify: define main_task so we can use it for assertions
  directory: streamline deletes
  song: start avoiding race in updateSongInfo
  playlist: small lines of code reduction
  Revert "Start using song pointers in core data structures"

Conflicts:
	src/playlist.c

1 files changed, 2 insertions, 4 deletions

diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index 8bba8ae2b..b6da51e5e 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -429,10 +429,8 @@ static int wavpack_open_wvc(InputStream *is_wvc)
 	char wvc_url[MPD_PATH_MAX];
 	size_t len;
 
-	/* This is the only reader of dc.current_song */
-	if (!get_song_url(wvc_url, dc.current_song))
-		return 0;
-
+	/* This is the only reader of dc.utf8url (in inputPlugins) */
+	pathcpy_trunc(wvc_url, dc.utf8url);
 	len = strlen(wvc_url);
 	if ((len + 2) >= MPD_PATH_MAX)
 		return 0;