From e4a4af16734a7b63bf23b27ce0c6041276e6ecc3 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 11 Apr 2018 12:04:50 -0400 Subject: #606 more cleanups --- www/js/MonitorModalCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index ff0368cd..887d3328 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -199,7 +199,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ NVRDataModel.debug("MonitorModalCtrl: Re-login detected, resetting everything & re-generating connkey"); //NVRDataModel.stopNetwork("MonitorModal-auth success"); - NVRDataModel.killStream($scope.connKey); + NVRDataModel.killLiveStream($scope.connKey, $scope.controlURL); $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); }); @@ -266,7 +266,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $interval.cancel(cycleHandle); NVRDataModel.debug("Killing single stream..."); - NVRDataModel.killStream($scope.connKey); + NVRDataModel.killLiveStream($scope.connKey, $scope.controlURL); // $interval.cancel(modalIntervalHandle); // FIXME: Do I need to setAwake(false) here? @@ -1172,7 +1172,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.isModalActive = false; NVRDataModel.debug("Single monitor exited, killing stream"); - NVRDataModel.killStream($scope.connKey); + NVRDataModel.killLiveStream($scope.connKey, $scope.controlURL); -- cgit v1.2.3