MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-29 23:46:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Fixup crash if playback stops while sending metadata

Browse Source
This commit is contained in:
ejurgensen 2019-03-22 23:24:11 +01:00
parent 95deef9c06
commit aa36353480
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/player.c
View File

@ -429,7 +429,12 @@ pause_timer_cb(int fd, short what, void *arg)
static int static int
metadata_finalize_cb(struct output_metadata *metadata) metadata_finalize_cb(struct output_metadata *metadata)
{ {
if (metadata->item_id != pb_session.playing_now->item_id) if (!pb_session.playing_now)
{
DPRINTF(E_WARN, L_PLAYER, "Aborting metadata_send(), playback stopped during metadata preparation\n");
return -1;
}
else if (metadata->item_id != pb_session.playing_now->item_id)
{ {
DPRINTF(E_WARN, L_PLAYER, "Aborting metadata_send(), item_id changed during metadata preparation (%" PRIu32 " -> %" PRIu32 ")\n", DPRINTF(E_WARN, L_PLAYER, "Aborting metadata_send(), item_id changed during metadata preparation (%" PRIu32 " -> %" PRIu32 ")\n",
metadata->item_id, pb_session.playing_now->item_id); metadata->item_id, pb_session.playing_now->item_id);