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

playlist/Song: catch SongLoader exceptions

Browse Source 
Fixes aborted "load" commands due to SongLoader failure.
This commit is contained in:
Max Kellermann
2016-04-12 21:09:53 +02:00
parent 91afc7b23c
commit 4f393553f4
1 changed files with 10 additions and 1 deletions

11
src/playlist/PlaylistSong.cxx

@@ -27,6 +27,8 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include <stdexcept>
#include <string.h> #include <string.h>
static void static void
@@ -44,7 +46,14 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base)
static bool static bool
playlist_check_load_song(DetachedSong &song, const SongLoader &loader) 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) if (tmp == nullptr)
return false; return false;