summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernt Hansen <bernt@norang.ca>2010-10-03 11:47:15 -0400
committerBernt Hansen <bernt@norang.ca>2010-10-03 11:47:15 -0400
commit344785bd8cfa5afd6458658d7ff05cbfa6b1e7d2 (patch)
tree154f19f6143f608bee181b26dad5ccf3b15159fb
parent17c71a40c6d07baae2e9cac606668683ddb3759c (diff)
downloadorg-mode-344785bd8cfa5afd6458658d7ff05cbfa6b1e7d2.tar.gz
Fix dangling clocks created by org-clock-out-hook clocking in again
This is a fixup patch to commit 17c71a40c6d07baae2e9cac606668683ddb3759c. The org-clock-clocking-in variable needs to be set when we are clocking out - in case the clock out hook clocks-in again. This fixes a bug that creates dangling clock entries.
-rw-r--r--lisp/org-clock.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 5b4b39c..c6f05fc 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -975,7 +975,8 @@ the clocking selection, associated with the letter `d'."
(move-marker org-clock-interrupted-task
(marker-position org-clock-marker)
(marker-buffer org-clock-marker))
- (org-clock-out t))
+ (let ((org-clock-clocking-in t))
+ (org-clock-out t)))
(when (equal select '(16))
;; Mark as default clocking task