From 50085d5db508b45f8406da30cf48168e54b13555 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 6 Apr 2010 17:12:14 +0200 Subject: [PATCH] Fix BasePlaybackController with respect to test_next_track_before_play --- mopidy/backends/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index 4ac80d41..cc37027a 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -312,11 +312,14 @@ class BasePlaybackController(object): enabled this should be a random track, all tracks should be played once before the list repeats. """ + tracks = self.backend.current_playlist.playlist.tracks + if self.current_track is None: + if tracks: + return tracks[0] return None try: - return self.backend.current_playlist.playlist.tracks[ - self.playlist_position + 1] + return tracks[self.playlist_position + 1] except IndexError: return None