Main: use getExternalStorageDirectory() for locating mpd.conf

This commit is contained in:
Max Kellermann 2014-03-02 00:24:31 +01:00
parent 477877406a
commit 8cf3ac200b

View File

@ -430,8 +430,17 @@ int mpd_main(int argc, char *argv[])
(void)argc; (void)argc;
(void)argv; (void)argv;
if (!ReadConfigFile(Path::FromFS("/sdcard/mpd.conf"), error)) {
LogError(error); const auto sdcard = Environment::getExternalStorageDirectory();
if (!sdcard.IsNull()) {
const auto config_path =
AllocatedPath::Build(sdcard, "mpd.conf");
if (!ReadConfigFile(config_path, error)) {
LogError(error);
return EXIT_FAILURE;
}
}
}
#else #else
if (!parse_cmdline(argc, argv, &options, error)) { if (!parse_cmdline(argc, argv, &options, error)) {
LogError(error); LogError(error);