From cc4abf509794010b3cbd008fe9f81f4c10d915a5 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 21 Oct 2010 22:07:27 +0200
Subject: [PATCH] Add fix for GH-17

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

diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 3a32ce07..aead26af 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -387,6 +387,9 @@ class BasePlaybackController(object):
             self.current_cp_track = cp_track
             self.state = self.PLAYING
             if not self._play(cp_track[1]):
+                # Track is not playable
+                if self.random and self._shuffled:
+                    self._shuffled.remove(cp_track)
                 if on_error_step == 1:
                     self.next()
                 elif on_error_step == -1: