From c2d6f3ab89f4b8b5e5cc070d43a5e08236b11fba Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 6 Apr 2010 22:20:26 +0200 Subject: [PATCH] Cleaup next_track somewhat --- mopidy/backends/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index c6addd32..e44c1f86 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -315,10 +315,12 @@ class BasePlaybackController(object): """ tracks = self.backend.current_playlist.playlist.tracks - if self.current_track is None: - if tracks: - return tracks[0] + if not tracks: return None + + if self.current_track is None: + return tracks[0] + try: return tracks[self.playlist_position + 1] except IndexError: