From aac1f8e7a84cf5e4f0603ef66433b91008365300 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 21 Apr 2018 20:10:28 -0400
Subject: #614 same behavior for event thumbnail

---
 www/js/EventModalCtrl.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 46fda660..5f37fa69 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -976,7 +976,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         if (m.snapshot == 'enabled') {
             isSnapShotEnabled = true;
             currentStreamState = streamState.SNAPSHOT;
-            maxAlarmFid = m.snapshotId;
+            if (m.snapshotId) maxAlarmFid = m.snapshotId;
             eventId = m.eventId;
             $scope.eventId = m.eventId;
           
@@ -1480,12 +1480,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             NVRDataModel.debug ("Next is index:"+i+" maxScoreId:"+$scope.moments[i].Event.MaxScoreFrameId);
             maxAlarmFid = $scope.moments[i].Event.MaxScoreFrameId;
             eventId = $scope.moments[i].Event.Id;
+            return;
         }
 
-            if (currentStreamState == streamState.ACTIVE) {
+            if (1) {
                // NVRDataModel.log("using zms to move ");
 
-               if ($scope.defaultVideo == '' || $scope.defaultVideo == 'undefined') {
+               if (currentStreamState == streamState.ACTIVE && ($scope.defaultVideo == '' || $scope.defaultVideo == 'undefined')) {
                 // need to kill zms
                 currentStreamState = streamState.STOPPED;
                 $timeout (function() {
-- 
cgit v1.2.3