[elpa] externals-release/activities 98b652f9b6 3/4: Merge: (activities--bufferize-window-state) Handle deserializer errors

[ELPA Syncer]

branch: externals-release/activities
commit 98b652f9b658f87556db557913ec41ec2c919983
Merge: 74a6afa614 5d1e06c9c4
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: (activities--bufferize-window-state) Handle deserializer errors
---
 README.org    | 3 ++-
 activities.el | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index bf867b0d07..123831ca7b 100644
--- a/README.org
+++ b/README.org
@@ -153,7 +153,8 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 ** v0.7.2-pre
 
-Nothing new yet.
+*Fixes*
++ Handle errors from window parameter deserializers.  
([[https://github.com/alphapapa/activities.el/issues/44][#44]].  Thanks to 
[[https://github.com/karthink][Karthik Chikmagalur]] and 
[[https://github.com/stardiviner][stardiviner]] for reporting.)
 
 ** v0.7.1
 
diff --git a/activities.el b/activities.el
index 15f75e0e0f..b53c31dbe4 100644
--- a/activities.el
+++ b/activities.el
@@ -675,9 +675,11 @@ activity's name is NAME."
                              ((map parameters) attrs))
                   (pcase-dolist (`(,parameter . ,(map deserialize))
                                  activities-window-parameters-translators)
-                    (when (map-elt parameters parameter)
-                      (setf (map-elt parameters parameter)
-                            (funcall deserialize (map-elt parameters 
parameter)))))
+                    (condition-case-unless-debug nil
+                        (when (map-elt parameters parameter)
+                          (setf (map-elt parameters parameter)
+                                (funcall deserialize (map-elt parameters 
parameter))))
+                      (error (setf parameters (map-delete parameters 
parameter)))))
                   (setf (map-elt attrs 'parameters) parameters)
                   (cons 'leaf attrs))))
     (if-let ((leaf-pos (cl-position 'leaf state)))