From bbacea55f5a85635302c4f5c0773634899a9786a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Dec 2014 11:28:15 +0100 Subject: [PATCH] org-timer: Fix "No running timer" error * lisp/org-timer.el (org-timer-stop): Do not look after `org-timer-current-timer', which is a variable related to countdown timer, whereas the function is related to relative timer. Reported-by: Randy Smith --- lisp/org-timer.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index f44b1cf62..bcc3e1c0c 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -160,14 +160,12 @@ With prefix arg STOP, stop it entirely." (defun org-timer-stop () "Stop the relative timer." (interactive) - (if (not org-timer-current-timer) - (message "No running timer") - (run-hooks 'org-timer-stop-hook) - (setq org-timer-start-time nil - org-timer-pause-time nil - org-timer-current-timer nil) - (org-timer-set-mode-line 'off) - (message "Timer stopped"))) + (run-hooks 'org-timer-stop-hook) + (setq org-timer-start-time nil + org-timer-pause-time nil + org-timer-current-timer nil) + (org-timer-set-mode-line 'off) + (message "Timer stopped")) ;;;###autoload (defun org-timer (&optional restart no-insert-p) -- 2.11.4.GIT