From 035d518cb686d314f586ed6a2acc94e3b59183fe Mon Sep 17 00:00:00 2001 From: Richard Arends Date: Sun, 13 Dec 2015 19:54:10 +0100 Subject: [PATCH] Expect the case where currentsong['name'] can be absent. Use the .get funtion with a default value set to None --- homeassistant/components/media_player/mpd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py index f84013fd573..a61dac88150 100644 --- a/homeassistant/components/media_player/mpd.py +++ b/homeassistant/components/media_player/mpd.py @@ -141,13 +141,13 @@ class MpdDevice(MediaPlayerDevice): @property def media_title(self): """ Title of current playing media. """ - name = self.currentsong['name'] + name = self.currentsong.get('name', None) title = self.currentsong['title'] - if name: - return '{}: {}'.format(name, title) - else: + if name is None: return title + else: + return '{}: {}'.format(name, title) @property def media_artist(self):