#606 made simulstreaming optional

2 files changed, 14 insertions, 1 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 393cfd89..f930be8d 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -176,7 +176,8 @@ angular.module('zmApp.controllers')
         'momentMonitorFilter': [],
         'enableMomentSubMenu': true,
         'momentArrangeBy': 'StartTime',
-        'showLiveForInProgressEvents': true
+        'showLiveForInProgressEvents': true,
+        'disableSimulStreaming': false,
 
 
       };
@@ -843,6 +844,12 @@ angular.module('zmApp.controllers')
                     loginData.defaultPushSound = false;
                   }
 
+
+                  if (typeof loginData.disableSimulStreaming == 'undefined') {
+                   
+                    loginData.disableSimulStreaming = false;
+                  }
+
                   if (typeof loginData.exitOnSleep == 'undefined') {
                     debug("exitOnSleep does not exist. Setting to false");
                     loginData.exitOnSleep = false;
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 4bee1453..bac79b9f 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1714,6 +1714,12 @@ angular.module('zmApp.controllers')
                 simulStreaming = '1';
                 NVRDataModel.debug ("IOS detected, force enabling simulStreams");
             }
+
+            if (ld.disableSimulStreaming) {
+                simulStreaming = '0';
+                NVRDataModel.debug ("Forcing simulStreams off as you have disabled it");
+
+            }
         },
         function (err) {
             NVRDataModel.debug("******* SHOULD NEVER HAPPEN - MULTIPORT ERROR");