oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: check the music directory

Browse Source 
Move call from Mapper.cxx.
This commit is contained in:
Max Kellermann 2014-02-07 23:29:20 +01:00
parent ec8873b178
commit 4d5ebafa6d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Main.cxx
View File

@ -46,6 +46,7 @@
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/Config.hxx" #include "fs/Config.hxx"
#include "fs/StandardDirectory.hxx" #include "fs/StandardDirectory.hxx"
#include "fs/CheckFile.hxx"
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "zeroconf/ZeroconfGlue.hxx" #include "zeroconf/ZeroconfGlue.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
@ -145,8 +146,10 @@ glue_mapper_init(Error &error)
if (music_dir.IsNull()) if (music_dir.IsNull())
music_dir = GetUserMusicDir(); music_dir = GetUserMusicDir();
if (!music_dir.IsNull()) if (!music_dir.IsNull()) {
music_dir.ChopSeparators(); music_dir.ChopSeparators();
CheckDirectoryReadable(music_dir);
}
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
if (!music_dir.IsNull()) { if (!music_dir.IsNull()) {

2
src/Mapper.cxx
View File

@ -54,8 +54,6 @@ mapper_set_music_dir(AllocatedPath &&path)
assert(!path.IsNull()); assert(!path.IsNull());
music_dir_fs = std::move(path); music_dir_fs = std::move(path);
CheckDirectoryReadable(music_dir_fs);
} }
#endif #endif