2 files changed, 6 insertions, 1 deletions
diff --git a/src/directory.c b/src/directory.c
index f6bb50913..38f32c271 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -86,7 +86,7 @@ static void deleteEmptyDirectoriesInDirectory(Directory * directory)
 
 	for (i = dv->nr; --i >= 0; ) {
 		deleteEmptyDirectoriesInDirectory(dv->base[i]);
-		if (!dv->base[i]->children.nr && !dv->base[i]->songs.nr)
+		if (directory_is_empty(dv->base[i]))
 			dirvec_delete(dv, dv->base[i]);
 	}
 	if (!dv->nr)
diff --git a/src/directory.h b/src/directory.h
index c43f8f3c5..552bbe28e 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -49,6 +49,11 @@ Directory * newDirectory(const char *dirname, Directory * parent);
 
 void freeDirectory(Directory * directory);
 
+static inline int directory_is_empty(Directory *directory)
+{
+	return directory->children.nr == 0 && directory->songs.nr == 0;
+}
+
 Directory * getDirectory(const char *name);
 
 void sortDirectory(Directory * directory);