Merge pull request #814 from Mosibi/fix_mpd_title_keyerror

Fix KeyError on 'title' when title is empty
This commit is contained in:
Paulus Schoutsen 2015-12-31 11:04:30 -08:00
commit 6cb991d583

View File

@ -142,10 +142,14 @@ class MpdDevice(MediaPlayerDevice):
def media_title(self):
""" Title of current playing media. """
name = self.currentsong.get('name', None)
title = self.currentsong['title']
title = self.currentsong.get('title', None)
if name is None:
if name is None and title is None:
return "None"
elif name is None:
return title
elif title is None:
return name
else:
return '{}: {}'.format(name, title)