From 40e07fd39fa64b174cfe79312a96f9b82d72d4b4 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 14 Apr 2018 18:01:00 -0400 Subject: #602 #606 - iOS won't support multiport. Webkit bug see https://bugs.webkit.org/show_bug.cgi?id=35377 --- www/js/DevOptionsCtrl.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'www/js/DevOptionsCtrl.js') diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index e6f107c2..92c1e2c0 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -72,6 +72,10 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' return NVRDataModel.getTimeZoneNow(); }; + $scope.checkMultiPortToggle = function() { + if ($rootScope.platformOS == 'ios') + $scope.loginData.disableSimulStreaming = true; + }; //------------------------------------------------------------------ // Perform the login action when the user submits the login form //------------------------------------------------------------------ @@ -109,6 +113,9 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' $scope.loginData.singleImageQuality = zm.safeImageQuality.toString(); } + if (!$scope.loginData.disableSimulStreaming && $rootScope.platformOS=='ios') { + $scope.loginData.disableSimulStreaming = true; + } NVRDataModel.debug("SaveDevOptions: Saving to disk"); NVRDataModel.setLogin($scope.loginData); NVRDataModel.getMonitors(1); -- cgit v1.2.3