From 6bb6258b8fcf0db494eb9b4de567b000e934e1ae Mon Sep 17 00:00:00 2001
From: Dmitry Kalinin <dmitry.kalinin@intel.com>
Date: Thu, 4 Jun 2020 18:49:10 +0300
Subject: [PATCH] fixed activation bug

---
 cvat-ui/package-lock.json                                       | 2 +-
 cvat-ui/package.json                                            | 2 +-
 .../annotation-page/standard-workspace/canvas-wrapper.tsx       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
index 6960db8d..a375e42d 100644
--- a/cvat-ui/package-lock.json
+++ b/cvat-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index 00831d57..d9c4c6e6 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
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
index da293251..ef962c54 100644
--- 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}`);