From 4838e911e8b9d76bce96bf7b711a0344e940f7a9 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 8 Oct 2019 23:40:57 -0700 Subject: [PATCH] Fixed bug in marker tag application --- ptulsconv/transformations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ptulsconv/transformations.py b/ptulsconv/transformations.py index 4a662d1..cf2ef69 100644 --- a/ptulsconv/transformations.py +++ b/ptulsconv/transformations.py @@ -189,13 +189,13 @@ class TagInterpreter(Transformation): for marker in markers: marker_name_tags = self.parse_tags(marker['name']) marker_comment_tags = self.parse_tags(marker['comments']) - effective_tags = marker_name_tags['tags'].update(marker_comment_tags['tags']) or dict() + effective_tags = marker_name_tags['tags'] + effective_tags.update(marker_comment_tags['tags']) if marker['location_decoded']['frame_count'] <= time: retval.update(effective_tags) else: break - return retval def parse_tags(self, source):