From ff28f74a8ad34880b85f94a106c009b15b13f925 Mon Sep 17 00:00:00 2001 From: Chrystian Huot Date: Tue, 2 Jun 2020 09:15:14 -0400 Subject: [PATCH] Call being played is not stopped when its group is deactivated --- .../components/rdio-scanner/rdio-scanner.service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/app/components/rdio-scanner/rdio-scanner.service.ts b/client/src/app/components/rdio-scanner/rdio-scanner.service.ts index 6702588..5b953f0 100644 --- a/client/src/app/components/rdio-scanner/rdio-scanner.service.ts +++ b/client/src/app/components/rdio-scanner/rdio-scanner.service.ts @@ -139,12 +139,6 @@ export class AppRdioScannerService implements OnDestroy { this.cleanQueue(); - if (this.call && !(this.liveFeedMap && this.liveFeedMap[this.call.system] && - this.liveFeedMap[this.call.system][this.call.talkgroup])) { - - this.skip(); - } - this.buildGroups(); this.liveFeedStore(); @@ -521,6 +515,12 @@ export class AppRdioScannerService implements OnDestroy { this.callQueue = this.callQueue.filter((call: RdioScannerCall) => { return this.liveFeedMap && this.liveFeedMap[call.system] && this.liveFeedMap[call.system][call.talkgroup]; }); + + if (this.call && !(this.liveFeedMap && this.liveFeedMap[this.call.system] && + this.liveFeedMap[this.call.system][this.call.talkgroup])) { + + this.skip(); + } } private download(call: RdioScannerCall): void {