diff options
author | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
commit | 8422402c39d523c8ce9336e9ecf52950f1905bce (patch) | |
tree | 4c5d3778768890e192685bd9b02f251b9cf85cbf /src/mapper.c | |
parent | b5fde6dfa55676560ee8805e8e00bc188a5ad928 (diff) | |
parent | 9374e0f4454ff5a37f70ce2d6110d5612856a169 (diff) | |
download | mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.tar.gz mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.tar.xz mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.zip |
Merge branch 'v0.17.x'
Conflicts:
src/player_thread.c
Diffstat (limited to 'src/mapper.c')
-rw-r--r-- | src/mapper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapper.c b/src/mapper.c index 6a968e32d..7db74b1af 100644 --- a/src/mapper.c +++ b/src/mapper.c @@ -93,10 +93,10 @@ check_directory(const char *path) #endif DIR *dir = opendir(path); - if (dir == NULL && errno == EACCES) - g_warning("No permission to read directory: %s", path); - else + if (dir != NULL) closedir(dir); + else if (errno == EACCES) + g_warning("No permission to read directory: %s", path); } static void |