[blackboard] bugfix for not yet available activity streams on views (#…

…140)
splintered-reality · Dec 30, 2019 · 8f75b21 · 8f75b21
1 parent 226fdcf
commit 8f75b21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,8 @@ Changelog
 
 Forthcoming
 -----------
-* [trees] bugfix to toggle activity client on reconfigure, `#139 <https://github.com/splintered-reality/py_trees_ros/pull/139>`_,
+* [blackboard] bugfix protection against activity stream not activitated for views, `#140 <https://github.com/splintered-reality/py_trees_ros/pull/140>`_,
+* [trees] bugfix toggle for activity client on reconfigure, `#139 <https://github.com/splintered-reality/py_trees_ros/pull/139>`_,
 
 2.0.3 (2019-12-26)
 ------------------

diff --git a/py_trees_ros/blackboard.py b/py_trees_ros/blackboard.py
@@ -190,7 +190,7 @@ def is_changed(self, visited_clients: typing.Set[uuid.UUID]) -> bool:
         # update the sub blackboard
         self.sub_blackboard.update(self.tracked_variable_names)
         # update the sub activity stream
-        if self.with_activity_stream:
+        if self.with_activity_stream and py_trees.blackboard.Blackboard.activity_stream is not None:
             self.sub_activity_stream.clear()
             for activity_item in py_trees.blackboard.Blackboard.activity_stream.data:
                 if activity_item.key in self.tracked_keys: