From e594d560ff66b9795fb744e64d3ddd378d37b148 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 26 Jul 2016 21:33:16 +0200 Subject: [PATCH] audio: Make sure tags are never none (Fixes #1449) --- docs/changelog.rst | 2 ++ mopidy/audio/actor.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index c69514da..e82b2d06 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -33,6 +33,8 @@ Bug fix release. - Audio: Make sure scanner handles streams without a duration. (Fixes: :issue:`1526`) +- Audio: Ensure audio tags are never `None`. (Fixes: :issue:`1449`) + - Core: Avoid endless loop if all tracks in the tracklist are unplayable and consume mode is off. (Fixes: :issue:`1221`, :issue:`1454`, PR: :issue:`1455`) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 1fb4fec6..61a8e008 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -368,7 +368,7 @@ class _Handler(object): # Emit any postponed tags that we got after about-to-finish. tags, self._audio._pending_tags = self._audio._pending_tags, None - self._audio._tags = tags + self._audio._tags = tags or {} if tags: logger.debug('Audio event: tags_changed(tags=%r)', tags.keys())