playlist/Song: catch SongLoader exceptions

Fixes aborted "load" commands due to SongLoader failure.

playlist/Song: catch SongLoader exceptions
4f393553 · Max Kellermann · 91afc7b2 · 4f393553
Commit 4f393553 authored Apr 12, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

PlaylistSong.cxx src/playlist/PlaylistSong.cxx +10 -1

No files found.
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -27,6 +27,8 @@
 #include "util/Error.hxx"
 #include "DetachedSong.hxx"

+#include <stdexcept>
+
 #include <string.h>

 static void
@@ -44,7 +46,14 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base)
 static bool
 playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
 {
-	DetachedSong *tmp = loader.LoadSong(song.GetURI(), IgnoreError());
+	DetachedSong *tmp;
+
+	try {
+		tmp = loader.LoadSong(song.GetURI(), IgnoreError());
+	} catch (const std::runtime_error &) {
+		return false;
+	}
+
 	if (tmp == nullptr)
 		return false;