From d00ccb945c610bf748b2ed36e4b2fddc1c40b5ba Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 22 May 2021 11:56:25 +0200
Subject: [PATCH] Fix destoy method. Closes #3442

---
 src/canvas/index.js           | 2 +-
 src/canvas/view/CanvasView.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/canvas/index.js b/src/canvas/index.js
index 75b69b8c0..10c641389 100644
--- a/src/canvas/index.js
+++ b/src/canvas/index.js
@@ -646,7 +646,7 @@ export default () => {
 
     destroy() {
       canvas.stopListening();
-      CanvasView.remove();
+      CanvasView && CanvasView.remove();
       [c, canvas, CanvasView].forEach(i => (i = {}));
       ['em', 'model', 'droppable'].forEach(i => (this[i] = {}));
     }
diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index a11e34c71..2b946f704 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -75,9 +75,9 @@ export default Backbone.View.extend({
   },
 
   remove() {
+    this.frames.remove();
     const frm = this.model.get('frames');
     frm.remove(frm.models);
-    this.frames.remove();
     this.frames = {};
     Backbone.View.prototype.remove.apply(this, arguments);
     this.toggleListeners();