Merge pull request #124 from bargar/master

BUGFIX checkif component is destroyed before trying to set properties…
sir-dunxalot · Dec 31, 2016 · 9682929 · 9682929
2 parents 6ae40d8 + ea54c11
commit 9682929
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/addon/components/tether-tooltip-and-popover.js b/addon/components/tether-tooltip-and-popover.js
@@ -482,10 +482,13 @@ export default EmberTetherComponent.extend({
 
   stopTether() {
     run.schedule('afterRender', () => {
-      // can't depend on `_tether.enabled` because it's not an
-      // Ember property (so won't trigger cp update when changed)
-      this.set('_isTetherEnabled', false);
-      this.get('_tether').disable();
+      if (!this.isDestroyed && !this.isDestroying) {
+
+        // can't depend on `_tether.enabled` because it's not an
+        // Ember property (so won't trigger cp update when changed)
+        this.set('_isTetherEnabled', false);
+        this.get('_tether').disable();
+      }
     });
   },