fs/Path: add method ToUTF8Throw()

2018-07-18 16:30:46 +02:00
parent f87265a4d5
commit 32290d5eb8
10 changed files with 43 additions and 29 deletions
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -143,11 +143,13 @@ LoadPlaylistFileInfo(PlaylistInfo &info,
 		return false;

 	const auto name = AllocatedPath::FromFS(name_fs_str, name_fs_end);
-	std::string name_utf8 = name.ToUTF8();
-	if (name_utf8.empty())
-		return false;

-	info.name = std::move(name_utf8);
+	try {
+		info.name = name.ToUTF8Throw();
+	} catch (...) {
+		return false;
+	}
+
 	info.mtime = fi.GetModificationTime();
 	return true;
 }