diff options
author | William Xu <william.xwl@gmail.com> | 2009-07-26 12:56:27 +0800 |
---|---|---|
committer | William Xu <william.xwl@gmail.com> | 2009-07-26 12:56:27 +0800 |
commit | 79096375362b8ee33ee5842e0f94da90535e2999 (patch) | |
tree | d1545d1a940aeb8b9d4171c2d946af9c6723772b /lisp/emms-browser.el | |
parent | 6ad7be5a8dfce022a64a059dd4e5e3e0061ce33f (diff) | |
parent | 67bcbeb63bd0d73632992d0106524b118a89fd29 (diff) |
Merge branch 'master' of ssh://xwl@git.sv.gnu.org/srv/git/emms
Diffstat (limited to 'lisp/emms-browser.el')
-rw-r--r-- | lisp/emms-browser.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/emms-browser.el b/lisp/emms-browser.el index 1329a60..5286d75 100644 --- a/lisp/emms-browser.el +++ b/lisp/emms-browser.el @@ -656,10 +656,11 @@ compilations, etc." 'emms-browser-filter-tracks-hook track) (setq field (emms-browser-get-track-field track type)) - (setq existing-entry (gethash field hash)) - (if existing-entry - (puthash field (cons track existing-entry) hash) - (puthash field (list track) hash)))) + (when field + (setq existing-entry (gethash field hash)) + (if existing-entry + (puthash field (cons track existing-entry) hash) + (puthash field (list track) hash))))) emms-cache-db) hash)) @@ -1508,9 +1509,9 @@ included." (dolist (item search-list) (setq matched nil) (dolist (field (car item)) - (when (string-match (cadr item) - (emms-track-get track field "")) - (setq matched t))) + (let ((track-field (emms-track-get track field ""))) + (when (and track-field (string-match (cadr item) track-field)) + (setq matched t)))) (unless matched (setq no-match t))) (not no-match))) |