Skip to content

M
mpd
Commit 06c17283 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

queue/PlaylistUpdate: catch and ignore DatabaseError

Fixes regression by commit 42f7df96
parent 1543dd85
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
src/queue/PlaylistUpdate.cxx
View file @ 06c17283
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "Playlist.hxx" #include "Playlist.hxx"
#include "db/Interface.hxx" #include "db/Interface.hxx"
#include "db/LightSong.hxx" #include "db/LightSong.hxx"
#include "db/DatabaseError.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
...@@ -32,7 +33,13 @@ UpdatePlaylistSong(const Database &db, DetachedSong &song) ...@@ -32,7 +33,13 @@ UpdatePlaylistSong(const Database &db, DetachedSong &song)
from the Database */ from the Database */
return false; return false;
const LightSong *original = db.GetSong(song.GetURI(), IgnoreError()); const LightSong *original;
try {
original = db.GetSong(song.GetURI(), IgnoreError());
} catch (DatabaseError) {
return false;
}
if (original == nullptr) if (original == nullptr)
/* not found - shouldn't happen, because the update /* not found - shouldn't happen, because the update
thread should ensure that all stale Song instances thread should ensure that all stale Song instances
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment