Merge pull request #1647 from opencv/dk/batch_of_fixes_1

Fixed activation bug with frame switching
cvat-ai · Jun 5, 2020 · 45f71f8 · 45f71f8
2 parents fa9b463 + 6bb6258
commit 45f71f8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx
@@ -571,7 +571,7 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
                     canvasInstance.fit();
                 }
             }
-            if (activatedState.objectType !== ObjectType.TAG) {
+            if (activatedState && activatedState.objectType !== ObjectType.TAG) {
                 canvasInstance.activate(activatedStateID, activatedAttributeID);
             }
             const el = window.document.getElementById(`cvat_canvas_shape_${activatedStateID}`);