fix(annotator): Fail silently if annotator destroy call fails (#1215)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
box · May 29, 2020 · 841cd5a · 841cd5a
1 parent 699e859
commit 841cd5a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -254,8 +254,12 @@ class BaseViewer extends EventEmitter {
 
         // Destroy the annotator
         if (this.annotator && typeof this.annotator.destroy === 'function') {
-            this.annotator.removeAllListeners();
-            this.annotator.destroy();
+            try {
+                this.annotator.removeAllListeners();
+                this.annotator.destroy();
+            } catch (error) {
+                // No-op, as annotator was likely never initialized in the first place
+            }
         }
 
         this.destroyed = true;