From 8cf3ac200b10cbab449b723d8b0f93cf94d479cf Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 2 Mar 2014 00:24:31 +0100
Subject: Main: use getExternalStorageDirectory() for locating mpd.conf

---
 src/Main.cxx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Main.cxx b/src/Main.cxx
index 165e53fd7..3a6346385 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -430,8 +430,17 @@ int mpd_main(int argc, char *argv[])
 	(void)argc;
 	(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
 	if (!parse_cmdline(argc, argv, &options, error)) {
 		LogError(error);
-- 
cgit v1.2.3