From 5d6fc7b092aba7bf95f98a80407b01dd0469fe1a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 24 Mar 2011 13:52:41 +0100
Subject: [PATCH] Avoid blocking forever waiting on search query responses from
 Spotify

---
 mopidy/backends/spotify/library.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py
index 2e7dbab1..40d4a099 100644
--- a/mopidy/backends/spotify/library.py
+++ b/mopidy/backends/spotify/library.py
@@ -56,4 +56,7 @@ class SpotifyLibraryProvider(BaseLibraryProvider):
         logger.debug(u'Spotify search query: %s' % spotify_query)
         queue = Queue.Queue()
         self.backend.spotify.search(spotify_query.encode(ENCODING), queue)
-        return queue.get()
+        try:
+            return queue.get(timeout=3) # XXX What is an reasonable timeout?
+        except Queue.Empty:
+            return Playlist(tracks=[])