Merge pull request #486 from trevordevore/patch-1

Author: kategengler

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,