diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
| commit | 5cc3338267214eb050e39bc509d8b4258cec6afd (patch) | |
| tree | e513393222f18a5d8d43fec116dac055e1a24d1a /src/inotify_update.c | |
| parent | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (diff) | |
| parent | 1ae89728593fce4a40882fa133b9db269015da8f (diff) | |
| download | mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.gz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.xz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/mapper.h
Diffstat (limited to 'src/inotify_update.c')
| -rw-r--r-- | src/inotify_update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inotify_update.c b/src/inotify_update.c index 02e55ee0b..3f4a8c0c4 100644 --- a/src/inotify_update.c +++ b/src/inotify_update.c @@ -266,7 +266,7 @@ mpd_inotify_callback(int wd, unsigned mask, (mask & IN_ISDIR) != 0) { /* a sub directory was changed: register those in inotify */ - const char *root = mapper_get_music_directory(); + const char *root = mapper_get_music_directory_fs(); const char *path_fs; char *allocated = NULL; @@ -308,7 +308,7 @@ mpd_inotify_init(unsigned max_depth) g_debug("initializing inotify"); - const char *path = mapper_get_music_directory(); + const char *path = mapper_get_music_directory_fs(); if (path == NULL) { g_debug("no music directory configured"); return; |