fixed montage swap for snapshot mode, color is blue when cycle is on

1 files changed, 15 insertions, 3 deletions

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 16bf149a..729c2036 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -604,7 +604,7 @@ angular.module('zmApp.controllers')
 
     function loadNotifications() {
       if (simulStreaming) {
-        console.log ("Skipping timer as simulStreaming");
+       // console.log ("Skipping timer as simulStreaming");
         return;
       }
 
@@ -706,6 +706,10 @@ angular.module('zmApp.controllers')
       }, 20);
     }
 
+    $scope.isCycleOn = function() {
+      return NVRDataModel.getLogin().cycleMontageProfiles;
+    }
+
     $scope.getCycleStatus = function () {
       var c = NVRDataModel.getLogin().cycleMontageProfiles;
       var str = (c) ? $translate.instant('kOn') : $translate.instant('kOff');
@@ -1460,12 +1464,12 @@ angular.module('zmApp.controllers')
       //console.log ("NEW POS="+ld.packeryPositions);
       NVRDataModel.setLogin(ld);
 
-      currentStreamState = streamState.STOPPED;
+      
       $timeout(function () { // after render
 
 
         if (simulStreaming) {
-
+          currentStreamState = streamState.STOPPED;
           NVRDataModel.debug("Killing all streams in montage to save memory/nw...");
 
           if ($rootScope.platformOS == 'ios') {
@@ -1493,6 +1497,14 @@ angular.module('zmApp.controllers')
          
 
         }
+        else {
+          NVRDataModel.regenConnKeys();
+            $scope.monitors = NVRDataModel.getMonitorsNow();
+            $scope.MontageMonitors = angular.copy($scope.monitors);
+            $timeout(function () {
+              initPackery();
+            }, zm.packeryTimer);
+        }