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

Main: don't require mpd.conf on Android

Browse Source 
Don't fail to start if mpd.conf does not exist; just use default
values.
This commit is contained in:
Max Kellermann 2014-07-30 10:22:22 +02:00
parent 6ba0b029e6
commit 82ecebb393
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.cxx
View File

@ -95,6 +95,7 @@
#include "android/Environment.hxx" #include "android/Environment.hxx"
#include "android/Context.hxx" #include "android/Context.hxx"
#include "fs/StandardDirectory.hxx" #include "fs/StandardDirectory.hxx"
#include "fs/FileSystem.hxx"
#include "org_musicpd_Bridge.h" #include "org_musicpd_Bridge.h"
#endif #endif
@ -448,7 +449,8 @@ int mpd_main(int argc, char *argv[])
if (!sdcard.IsNull()) { if (!sdcard.IsNull()) {
const auto config_path = const auto config_path =
AllocatedPath::Build(sdcard, "mpd.conf"); AllocatedPath::Build(sdcard, "mpd.conf");
if (!ReadConfigFile(config_path, error)) { if (FileExists(config_path) &&
!ReadConfigFile(config_path, error)) {
LogError(error); LogError(error);
return EXIT_FAILURE; return EXIT_FAILURE;
} }