From 6e594ab97ae1bc71d9737e49cdcb51be984731f2 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 18 Jul 2019 16:52:54 -0400
Subject: allow max FPS settings for Montage Mode (irrelevant if not using
 multiport)

---
 www/js/MonitorModalCtrl.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index bf6c95dd..1f0ce944 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -421,6 +421,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     var apiurl = NVR.getLogin().apiurl;
     var alarmurl = apiurl + "/monitors/alarm/id:" + $scope.monitorId + "/command:status.json?"+$rootScope.authSession;
     NVR.log("Invoking " + alarmurl);
+    console.log ("ALARM = "+alarmurl);
 
     $http.get(alarmurl)
       .then(function (data) {
@@ -1061,6 +1062,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
       var c = mode == 'on' ? 'on' : 'off';
       var alarmurl = apiurl + "/monitors/alarm/id:" + mid + "/command:" + c + ".json?"+$rootScope.authSession;
       NVR.log("Invoking " + alarmurl);
+      
 
       var status = mode ? $translate.instant('kForcingAlarm') : $translate.instant('kCancellingAlarm');
       $ionicLoading.show({
@@ -1257,7 +1259,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
     var stream;
-    var fps = NVR.getLogin().liveFPS;
+    var fps = NVR.getLogin().singleliveFPS;
     stream = $scope.monitor.Monitor.streamingURL +
       "/nph-zms?mode=" + getSingleStreamMode() +
       "&monitor=" + $scope.monitorId +
-- 
cgit v1.2.3