Ensure Engine Routes are deactivated before destruction

emberjs · Sep 10, 2016 · bb5fe60 · bb5fe60
1 parent b9dcde8
commit bb5fe60
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -452,20 +452,21 @@ const EmberRouter = EmberObject.extend(Evented, {
   },
 
   willDestroy() {
-    let instances = this._engineInstances;
-    for (let name in instances) {
-      for (let id in instances[name]) {
-        run(instances[name][id], 'destroy');
-      }
-    }
-
     if (this._toplevelView) {
       this._toplevelView.destroy();
       this._toplevelView = null;
     }
+
     this._super(...arguments);
 
     this.reset();
+
+    let instances = this._engineInstances;
+    for (let name in instances) {
+      for (let id in instances[name]) {
+        run(instances[name][id], 'destroy');
+      }
+    }
   },
 
   /*