emms-player-mpd: Really kill the client process, as documented, instead of waiting for it to time out.

darcs-hash:20060811185849-1bfb2-bcfc45ae54e42ad5c182bd7f3cd4b6ca5e76f3f3.gz

1 files changed, 4 insertions, 1 deletions

diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index 80c0449..d82499a 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -926,6 +926,9 @@ from other functions."
   (emms-cancel-timer emms-player-mpd-status-timer)
   (setq emms-player-mpd-status-timer nil)
   (setq emms-player-mpd-current-song nil)
+  (when (and (processp emms-player-mpd-process)
+             (memq (process-status emms-player-mpd-process) '(run open)))
+    (delete-process emms-player-mpd-process))
   (unless no-stop
     (let ((emms-player-stopped-p t))
       (emms-player-stopped))))
@@ -933,10 +936,10 @@ from other functions."
 (defun emms-player-mpd-stop ()
   "Stop the currently playing song."
   (interactive)
-  (emms-player-mpd-disconnect t)
   (condition-case nil
       (emms-player-mpd-send "stop" nil #'ignore)
     (error nil))
+  (emms-player-mpd-disconnect t)
   (let ((emms-player-stopped-p t))
     (emms-player-stopped)))