aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-06-03 16:58:09 +0200
committerMax Kellermann <max@duempel.org>2011-06-03 16:58:09 +0200
commite228caaca62c8752d36ed8425b7f52809d34d348 (patch)
tree8e4b225f005e6c4d457f52b4d2fd97fac12a99b4 /src/directory.h
parent9ac8f89b1d8a0c2b4a9ba391ce174fbb3fa816e9 (diff)
parent4b4aa64261154bcb1e521b98629c0640d6b259f7 (diff)
downloadmpd-e228caaca62c8752d36ed8425b7f52809d34d348.tar.gz
mpd-e228caaca62c8752d36ed8425b7f52809d34d348.tar.xz
mpd-e228caaca62c8752d36ed8425b7f52809d34d348.zip
Merge branch 'v0.16.x'
Conflicts: src/decoder/ffmpeg_decoder_plugin.c
Diffstat (limited to 'src/directory.h')
-rw-r--r--src/directory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/directory.h b/src/directory.h
index 98cc5f169..a3ad0ffa3 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -62,7 +62,8 @@ directory_free(struct directory *directory);
static inline bool
directory_is_empty(const struct directory *directory)
{
- return directory->children.nr == 0 && directory->songs.nr == 0;
+ return directory->children.nr == 0 && directory->songs.nr == 0 &&
+ playlist_vector_is_empty(&directory->playlists);
}
static inline const char *