From 1ee6a78cb727561e75a5d60135bb0cd7956f70b0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 12 Sep 2013 10:02:11 +0200 Subject: Path: add FromUTF8() overload that returns an Error --- src/Main.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Main.cxx') diff --git a/src/Main.cxx b/src/Main.cxx index a1138a908..80c6b0069 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -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; -- cgit v1.2.3