From: J. Alexander Treuman <jat@spatialrift.net>
Date: Thu, 15 Jul 2010 21:52:54 +0000 (-0400)
Subject: mpd.py: clear command list if an exception is raised
X-Git-Tag: v0.3.0~19
X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=commitdiff_plain;h=acefec82bb1b6dfd1230ecf8665a999f35aff300;hp=a55e3f15d6d53355acae2d809e1a5c512115b0dc

mpd.py: clear command list if an exception is raised

This fixes a very longstanding bug where an MPD command error would raise
an exception, but not clear the command list. This would prevent further
commands from being executed until the command list was completed, which
was impossible since the MPD command error broke out of the command list
on the server side.
---

diff --git a/mpd.py b/mpd.py
index 380f5b1..5e50295 100644
--- a/mpd.py
+++ b/mpd.py
@@ -269,9 +269,11 @@ class MPDClient(object):
             yield obj
 
     def _read_command_list(self):
-        for retval in self._command_list:
-            yield retval()
-        self._command_list = None
+        try:
+            for retval in self._command_list:
+                yield retval()
+        finally:
+            self._command_list = None
         self._fetch_nothing()
 
     def _iterator_wrapper(self, iterator):