#587 - when playing an event from event view, allow showing recorded feed if possible

2 files changed, 12 insertions, 1 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index efc98d27..a2a3cec0 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2864,6 +2864,7 @@ angular.module('zmApp.controllers')
                 scope: $scope,
                 animation: 'slide-in-up',
                 id: 'footage',
+                showLive:'disabled', // seems bool is not allowed...
             })
             .then(function(modal)
             {
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 86f2b233..52fc0711 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -16,6 +16,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     var event;
     var gEvent;
     var handle;
+    var showLive = true;
 
     var framearray = {
 
@@ -914,6 +915,15 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
             return;
 
+        showLive = true;
+        if (m.showLive == 'disabled') {
+            showLive = false;
+            NVRDataModel.debug ("I was explictly asked not to show live, cross my fingers...");
+        }
+        else {
+
+            NVRDataModel.debug ("If recording is in progress, live feed will be shown");
+        }
         $scope.isToggleListMenu = true;
         $scope.videoDynamicTime = "";
         $scope.videoIsReady = false;
@@ -1604,7 +1614,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
                     $scope.eventWarning = '';
 
-                    if (!event.Event.EndTime) {
+                    if (!event.Event.EndTime && showLive) {
                         $scope.eventWarning = $translate.instant('kEventStillRecording');
                          // if this happens we get to live feed 
                         $scope.liveFeedMid = event.Event.MonitorId;