aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2006-03-26 23:00:00 +0000
committerMichael Olson <mwolson@gnu.org>2006-03-26 23:00:00 +0000
commit22284f3dc9f47e26db32901d5528d4ab78aa75f4 (patch)
tree0a2ca0f81f9a1bacded0a5b758d9d5b1d6e3f87d
parentfa07ba5436dbca2c401dc6f00f5c5842b8827e77 (diff)
emms-player-mpd.el (emms-info-mpd): Prevent an error when we can't connect to a MusicPD instance. This prevents EMMS from causing Emacs to stop reading initialization settings.
darcs-hash:20060326230003-1bfb2-0f3bba7ce910dfd287a640fa35288b7027bc6b21.gz
-rw-r--r--emms-player-mpd.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index d0431a0..16e8c8b 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -646,11 +646,13 @@ info from MusicPD."
(emms-track-name track)))
(string-match emms-player-mpd-supported-regexp file)
(not (string-match "\\`http://" file)))
- (setq info (emms-player-mpd-get-alist
- (emms-player-mpd-parse-response
- (emms-player-mpd-send
- (concat "find filename "
- (emms-player-mpd-quote-file file)))))))))
+ (setq info (condition-case nil
+ (emms-player-mpd-get-alist
+ (emms-player-mpd-parse-response
+ (emms-player-mpd-send
+ (concat "find filename "
+ (emms-player-mpd-quote-file file)))))
+ (error nil))))))
(when info
(dolist (data info)
(let ((name (car data))