X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=mpd.py;h=02d27880d35759de8ea4cc960055720804703d23;hp=e16c8b8aa584ca7a5b5db0fa86faf002cc0afd5c;hb=11ad737dbfa521db07486a6cb789d3539a5ec4c0;hpb=ecdbc2e2d41d0e4545d6e4c68e9fd00e0f6129c3

diff --git a/mpd.py b/mpd.py
index e16c8b8..02d2788 100644
--- a/mpd.py
+++ b/mpd.py
@@ -39,6 +39,13 @@ class CommandListError(MPDError):
     pass
 
 
+class _NotConnected(object):
+    def __getattr__(self, attr):
+        return self._dummy
+
+    def _dummy(*args):
+        raise ConnectionError, "Not connected"
+
 class MPDClient(object):
     def __init__(self):
         self.iterate = False
@@ -275,12 +282,15 @@ class MPDClient(object):
     def _reset(self):
         self.mpd_version = None
         self._commandlist = None
-        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._sockfile = self._sock.makefile("rb+")
+        self._sock = None
+        self._sockfile = _NotConnected()
 
     def connect(self, host, port):
-        self.disconnect()
+        if self._sock:
+            self.disconnect()
+        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self._sock.connect((host, port))
+        self._sockfile = self._sock.makefile("rb+")
         self._hello()
 
     def disconnect(self):