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

Main: auto-configure state file on Android

This commit is contained in:
Max Kellermann 2014-03-02 00:35:37 +01:00
parent 8cf3ac200b
commit d77c83f4ba
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Main.cxx
View File

@ -94,6 +94,7 @@
#include "java/File.hxx" #include "java/File.hxx"
#include "android/Environment.hxx" #include "android/Environment.hxx"
#include "android/Context.hxx" #include "android/Context.hxx"
#include "fs/StandardDirectory.hxx"
#include "org_musicpd_Bridge.h" #include "org_musicpd_Bridge.h"
#endif #endif
@ -262,8 +263,20 @@ static bool
glue_state_file_init(Error &error) glue_state_file_init(Error &error)
{ {
auto path_fs = config_get_path(CONF_STATE_FILE, error); auto path_fs = config_get_path(CONF_STATE_FILE, error);
if (path_fs.IsNull()) if (path_fs.IsNull()) {
return !error.IsDefined(); if (error.IsDefined())
return false;
#ifdef ANDROID
const auto cache_dir = GetUserCacheDir();
if (cache_dir.IsNull())
return true;
path_fs = AllocatedPath::Build(cache_dir, "state");
#else
return true;
#endif
}
state_file = new StateFile(std::move(path_fs), state_file = new StateFile(std::move(path_fs),
*instance->partition, *instance->partition,