Merge branch 'ew/directory'

* ew/directory:
  Don't try to prune unless we're updating
  workaround race condition on updates with broken signal blocking
  Replace SongList with struct songvec
  directory: remove unused updateMp3Directory() function
  start using prefixcmp()
  Add prefixcmp() (stol^H^H^H^Hborrowed from git)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/dbUtils.c b/src/dbUtils.c
index 0eb485f1e..1ecb9f608 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -50,7 +50,7 @@ static int countSongsInDirectory(Directory * directory,
 {
 	int *count = (int *)data;
 
-	*count += directory->songs->numberOfNodes;
+	*count += directory->songs.nr;
 
 	return 0;
 }
@@ -357,7 +357,7 @@ static int sumSavedFilenameMemoryInDirectory(Directory * dir, void *data)
 		return 0;
 
 	*sum += (strlen(getDirectoryPath(dir)) + 1 - sizeof(Directory *)) *
-	    dir->songs->numberOfNodes;
+	    dir->songs.nr;
 
 	return 0;
 }