summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 351253c8..c62c2cf6 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -35,6 +35,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
var playState = 'play';
var isSeeking = false;
$scope.useFilters = true;
+
var broadcastHandles = [];
@@ -2136,7 +2137,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
}
- $scope.defaultVideo = event.Event.DefaultVideo;
+
+
+ var ld = NVR.getLogin();
+ if (ld.monitorSpecific[event.Event.MonitorId] &&
+ ld.monitorSpecific[event.Event.MonitorId].forceMjpeg) {
+ NVR.debug ('Monitor:'+event.Event.MonitorId+' has forced MJPEG playback');
+ $scope.defaultVideo ='';
+ } else {
+
+ $scope.defaultVideo = event.Event.DefaultVideo;
+ }
+
+
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();