Path: add FromUTF8() overload that returns an Error

This commit is contained in:
Max Kellermann
2013-09-12 10:02:11 +02:00
parent bf4ee48efa
commit 1ee6a78cb7
4 changed files with 26 additions and 8 deletions

View File

@@ -138,8 +138,12 @@ glue_mapper_init(Error &error)
if (playlist_dir.IsNull() && error.IsDefined())
return false;
if (music_dir.IsNull())
music_dir = Path::FromUTF8(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
if (music_dir.IsNull()) {
music_dir = Path::FromUTF8(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC),
error);
if (music_dir.IsNull())
return false;
}
mapper_init(std::move(music_dir), std::move(playlist_dir));
return true;