From 95ea3daa3566d10ec3d8b78ff93e71dca4a05e39 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Sat, 20 Feb 2010 04:26:20 +0100
Subject: [PATCH] Cleanup play method

---
 mopidy/backends/gstreamer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mopidy/backends/gstreamer.py b/mopidy/backends/gstreamer.py
index 266bb8a6..92670d91 100644
--- a/mopidy/backends/gstreamer.py
+++ b/mopidy/backends/gstreamer.py
@@ -71,10 +71,11 @@ class GStreamerPlaybackController(BasePlaybackController):
 
         if track:
             self.current_track = track
-        elif not self.current_track and not playlist.tracks:
+        elif not self.current_track:
+            self.current_track = self.next_track
+
+        if not self.current_track:
             return False
-        elif playlist.tracks:
-            self.current_track = playlist.tracks[0]
 
         self._bin.set_state(gst.STATE_READY)
         self._bin.set_property('uri', self.current_track.uri)