simplify-lastfm-timer-cancelation-and-bump-version.dpatch

darcs-hash:20070626191355-c06f4-ae6c018d47f4cd90c8fe1e76b6ad533d9c5b5a08.gz

2 files changed, 3 insertions, 4 deletions

diff --git a/emms-lastfm.el b/emms-lastfm.el
index d9e4db6..2d7493c 100644
--- a/emms-lastfm.el
+++ b/emms-lastfm.el
@@ -131,9 +131,8 @@ paused track resumes) and sets the track submission timer."
 
 (defun emms-lastfm-cancel-timer ()
   "Cancels `emms-lastfm-timer' if it is running."
-  (when emms-lastfm-timer
-    (emms-cancel-timer emms-lastfm-timer)
-    (setq emms-lastfm-timer nil)))
+  (emms-cancel-timer emms-lastfm-timer)
+  (setq emms-lastfm-timer nil))
 
 (defun emms-lastfm-pause ()
   "Handles things to be done when the player is paused or
diff --git a/emms.el b/emms.el
index ded069d..13bdaf8 100644
--- a/emms.el
+++ b/emms.el
@@ -39,7 +39,7 @@
 
 ;;; Code:
 
-(defvar emms-version "2.1"
+(defvar emms-version "3.0"
   "EMMS version string.")