From 2fb466e55e17aa73e6e655e6138ef429756bfc96 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 9 May 2018 09:00:17 -0400
Subject: fix undefined

---
 www/js/EventModalCtrl.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'www/js/EventModalCtrl.js')

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 7c78d1f8..d39af046 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -394,10 +394,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             if (resp.result == "Ok")
             {
 
-                $scope.currentProgress.progress = resp.status.progress;
-                $scope.eventId = resp.status.event;
+                if (resp.status) $scope.currentProgress.progress = resp.status.progress;
+                if (resp.status) $scope.eventId = resp.status.event;
                 $scope.d_eventId = $scope.eventId;
-                $scope.currentRate = resp.status.rate;
+                if (resp.status) $scope.currentRate = resp.status.rate;
 
                 if ($scope.currentProgress.progress > $scope.currentEventDuration) $scope.currentProgress.progress = $scope.currentEventDuration;
                 $scope.progressText = "At " + $scope.currentProgress.progress + "s of " + $scope.currentEventDuration + "s";
@@ -1017,7 +1017,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             $rootScope.authSession ;
         }
     
-       //console.log ("STREAM="+stream);
+       // console.log ($scope.currentStreamMode );
+      // console.log ("STREAM="+stream);
        //console.log ("EID="+$scope.eventId);
        if ($rootScope.basicAuthToken && stream) stream +="&basicauth="+$rootScope.basicAuthToken;
         return stream;
@@ -1391,15 +1392,28 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         $scope.loginData.gapless = !$scope.loginData.gapless;
         NVRDataModel.setLogin($scope.loginData);
 
+        $scope.currentStreamMode = $scope.loginData.gapless ? 'gapless' : 'single';
+
         NVRDataModel.debug("EventModalCtrl: gapless has changed resetting everything & re-generating connkey");
+        
         NVRDataModel.stopNetwork("EventModalCtrl-toggle gapless");
+        currentStreamState = streamState.STOPPED;
         NVRDataModel.debug("Regenerating connkey as gapless has changed");
         // console.log ("********* OFFSET FROM TOGGLE GAPLESS");
-        $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
-        $timeout(function()
-        {
-            sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress);
-        }, 500);
+        $timeout (function() {
+            $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
+            currentStreamState = streamState.ACTIVE;
+
+           /* $timeout(function()
+            {
+                sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress);
+            }, 500);*/
+
+        });
+        
+
+        
+        
         //$timeout.cancel(eventQueryHandle);
         //eventQueryHandle  = $timeout (function(){checkEvent();}, zm.eventPlaybackQuery);
 
-- 
cgit v1.2.3