Merge branch 'master' into demo

ebu · Oct 26, 2016 · f86a0fc · f86a0fc
2 parents 3d326e7 + 8b80a25
commit f86a0fc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ebu_tt_live/bindings/__init__.py b/ebu_tt_live/bindings/__init__.py
@@ -830,9 +830,12 @@ def _semantic_after_subtree_copy(self, copied_instance, dataset, element_content
                     for item in self.orderedContent()
                     if isinstance(item, ElementContent) and isinstance(item.value, style_type)
                 ]:
-            style_elem_styles = style_elem._semantic_deconflicted_ids(attr_name='style', dataset=dataset)
-            if style_elem_styles:
-                style_elem.style = style_elem_styles
+            copied_style_elem = dataset['instance_mapping'].get(style_elem)
+            # The style may not have been copied at all because it isn't used in the requested segment
+            if copied_style_elem is not None:
+                style_elem_styles = style_elem._semantic_deconflicted_ids(attr_name='style', dataset=dataset)
+                if style_elem_styles:
+                    copied_style_elem.style = style_elem_styles
 
 
 raw.styling._SetSupersedingClass(styling)