fix(view-controller): dismiss does not crash when called more than once

fixes #8395
ionic-team · Oct 2, 2016 · d5f71a4 · d5f71a4
1 parent 2bc4df8
commit d5f71a4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/navigation/test/view-controller.spec.ts b/src/navigation/test/view-controller.spec.ts
@@ -117,8 +117,26 @@ describe('ViewController', () => {
 
       viewController.dismiss('didDismiss data');
     }, 10000);
+
+    it('should not crash when calling dismiss() twice', (done) => {
+      // arrange
+      let viewController = mockView();
+      let navControllerBase = mockNavController();
+      mockViews(navControllerBase, [viewController]);
+
+      viewController.onDidDismiss((data: any) => {
+        expect(data).toEqual('didDismiss data');
+        setTimeout(() => {
+          viewController.dismiss(); // it should not crash
+          done();
+        }, 100);
+      });
+
+      viewController.dismiss('didDismiss data');
+    }, 10000);
   });
 
+
   afterEach(() => {
     if (subscription) {
       subscription.unsubscribe();

diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts
@@ -180,6 +180,10 @@ export class ViewController {
    *
    */
   dismiss(data?: any, role?: any, navOptions: NavOptions = {}) {
+    if (!this._nav) {
+      return Promise.resolve(false);
+    }
+
     let options = merge({}, this._leavingOpts, navOptions);
     this._onWillDismiss && this._onWillDismiss(data, role);
     return this._nav.remove(this._nav.indexOf(this), 1, options).then(() => {