fix: add destroyed prop to DecorationManagement

atom-minimap · Jan 16, 2021 · 784732d · 784732d
1 parent b9e351c
commit 784732d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/decoration-management.js b/lib/decoration-management.js
@@ -70,6 +70,9 @@ export default class DecorationManagement {
      * @access private
      */
     this.decorationDestroyedSubscriptions = new Map()
+
+    // is set to true when a minimapElement is destroyed
+    this.destroyed = false
   }
 
   /**
@@ -322,7 +325,7 @@ export default class DecorationManagement {
    * @emits  {did-change} when the decoration is created successfully
    */
   decorateMarker (marker, decorationParams) {
-    if (this.minimap.destroyed || marker == null) { return }
+    if (this.destroyed || this.minimap.destroyed || marker == null) { return }
 
     const { id } = marker
 
@@ -435,7 +438,7 @@ export default class DecorationManagement {
    * @access private
    */
   emitDecorationChanges (type, decoration) {
-    if (this.minimap.editorDestroyed()) { return }
+    if (this.destroyed || this.minimap.editorDestroyed()) { return }
 
     this.invalidateDecorationForScreenRowsCache()
 
@@ -535,7 +538,7 @@ export default class DecorationManagement {
     for (let i = 0, len = decorations.length; i < len; i++) {
       const decoration = decorations[i]
 
-      if (!this.minimap.editorDestroyed()) {
+      if (!this.destroyed && !this.minimap.editorDestroyed()) {
         this.emitDecorationChanges(decoration.getProperties().type, decoration)
       }
       this.emitter.emit('did-remove-decoration', {

diff --git a/lib/minimap-element.js b/lib/minimap-element.js
@@ -456,6 +456,7 @@ class MinimapElement {
   destroy () {
     this.subscriptions.dispose()
     this.DecorationManagement.removeAllDecorations()
+    this.DecorationManagement.destroyed = true
     this.detach()
     this.minimap.minimapElement = null
     this.minimap = null