Merge pull request #486 from trevordevore/patch-1

adopted-ember-addons · Sep 23, 2024 · 857638d · 857638d
2 parents 1dce72b + 817f6f5
commit 857638d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ember-infinity/src/components/infinity-loader.js b/ember-infinity/src/components/infinity-loader.js
@@ -177,7 +177,7 @@ export default class InfinityLoaderComponent extends Component {
     this._cancelTimers();
 
     this.infinityModelContent.then((infinityModel) => {
-      if (!this.isDestroyed) {
+      if (!this.isDestroyed && !this.isDestroying) {
         infinityModel.off(
           'infinityModelLoaded',
           this,