From d6fce1cf724bb318b08840459d23ed149260cb50 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 24 Oct 2010 20:34:37 +0200
Subject: [PATCH] Simplify play() logic

---
 mopidy/backends/base/playback.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 779903a7..66521d60 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -375,12 +375,14 @@ class BasePlaybackController(object):
 
         if cp_track is not None:
             assert cp_track in self.backend.current_playlist.cp_tracks
-        elif not self.current_cp_track:
+
+        if cp_track is None and self.current_cp_track is None:
             cp_track = self.cp_track_at_next
 
-        if self.state == self.PAUSED and cp_track is None:
+        if cp_track is None and self.state == self.PAUSED:
             self.resume()
-        elif cp_track is not None:
+
+        if cp_track is not None:
             self.current_cp_track = cp_track
             self.state = self.PLAYING
             if not self._play(cp_track[1]):