From 9b6bbb1ad3c7713e5b5d1afcecd3d78bfd37cafc Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 6 Apr 2010 17:13:29 +0200 Subject: [PATCH] Fix BasePlaybackController with respect to test_play_sets_current_track --- mopidy/backends/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index cc37027a..4a20c430 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -463,11 +463,16 @@ class BasePlaybackController(object): :param track: track to play :type track: :class:`mopidy.models.Track` or :class:`None` """ + next_track = self.next_track + if self.state == self.PAUSED and track is None: self.resume() elif track is not None and self._play(track): self.current_track = track self.state = self.PLAYING + elif next_track is not None and self._play(next_track): + self.current_track = next_track + self.state = self.PLAYING def _play(self, track): raise NotImplementedError