sanitisation

org-clock-waybar.el

@@ -84,9 +84,9 @@
 (defun org-clock-waybar--get-tags ()
   "Get the tags of the currently clocked-in task."
   (when (org-clocking-p)
-    (save-window-excursion
-      (org-clock-goto)
-      (org-get-tags))))
+    (or (org-with-point-at org-clock-marker (org-get-tags))
+        "")
+    ))
 
 (defun org-clock-waybar--get-clocked-task-json ()
   "Get the currently clocked-in task’s data as a stringified JSON object.
@@ -122,13 +122,18 @@ value of `org-clock-waybar-not-clocked-in-text'."
 This function is ought to be used via Emacsclient:
 
 emacsclient --eval '(org-clock-waybar-output-task)'"
-  (org-clock-waybar--get-clocked-task-json))
+  (let* ((output (org-clock-waybar--get-clocked-task-json))
+         (start 0)
+         (end (length output)))
+    (set-text-properties start end nil output)
+    output))
 
 (defun org-clock-waybar-setup ()
   "Setup org-clock-waybar.
 
 It adds `org-clock-waybar-save-task' to both `org-clock-in-hook' and
 `org-clock-out-hook'."
+  (add-hook 'org-clock-cancel-hook #'org-clock-waybar-save-task)
   (add-hook 'org-clock-in-hook #'org-clock-waybar-save-task)
   (add-hook 'org-clock-out-hook #'org-clock-waybar-save-task)
   (add-hook 'kill-emacs-hook #'org-clock-waybar-save-task))