From 4eb4b40e6324d903b7c138ae28260a063fd02033 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 1 Jun 2019 22:08:46 -0400 Subject: [PATCH] close modal on lock/logout. resolves #255 --- src/app/app.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2972b089d5b..0364e257eea 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -118,6 +118,9 @@ export class AppComponent implements OnInit { this.systemService.cancelProcessReload(); break; case 'loggedOut': + if (this.modal != null) { + this.modal.close(); + } this.notificationsService.updateConnection(); this.updateAppMenu(); this.systemService.startProcessReload(); @@ -133,6 +136,9 @@ export class AppComponent implements OnInit { await this.lockService.lock(true); break; case 'locked': + if (this.modal != null) { + this.modal.close(); + } this.router.navigate(['lock']); this.notificationsService.updateConnection(); this.updateAppMenu();