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, 3 insertions, 0 deletions

diff --git a/src/main_notify.c b/src/main_notify.c
index 2c546633d..04ceac62d 100644
--- a/src/main_notify.c
+++ b/src/main_notify.c
@@ -24,6 +24,8 @@
 #include "gcc.h"
 #include "log.h"
 
+pthread_t main_task;
+
 static struct ioOps main_notify_IO;
 static int main_pipe[2];
 
@@ -55,6 +57,7 @@ static int ioops_consume(int fd_count, fd_set * rfds,
 
 void init_main_notify(void)
 {
+	main_task = pthread_self();
 	init_async_pipe(main_pipe);
 	main_notify_IO.fdset = ioops_fdset;
 	main_notify_IO.consume = ioops_consume;