From 261d04bd79edd9174a1b2f3709ce22b100a2e3a4 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 26 Apr 2018 16:26:20 -0400
Subject: I tried, I failed, I succeeded, I failed, I gave up :-p #606

---
 www/js/DevOptionsCtrl.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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

diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index 92c1e2c0..9ae1ba39 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -54,10 +54,18 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     // reset power state on exit as if it is called after we enter another
     // state, that effectively overwrites current view power management needs
     //------------------------------------------------------------------------
-    $scope.$on('$ionicView.enter', function()
+    $scope.$on('$ionicView.beforeEnter', function()
     {
         //console.log("**VIEW ** DevOptions Ctrl Entered");
         $scope.loginData = NVRDataModel.getLogin();
+        $scope.isMultiPort = false;
+        
+        NVRDataModel.getZmsMultiPortSupport()
+        .then (function (data) {
+            $scope.isMultiPort = (data == 0) ? false:true;
+            NVRDataModel.debug ("Multiport report:"+$scope.isMultiPort);
+        });
+        
 
         NVRDataModel.setAwake(false);
     });
@@ -73,8 +81,8 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     };
 
     $scope.checkMultiPortToggle = function() {
-        if ($rootScope.platformOS == 'ios')
-            $scope.loginData.disableSimulStreaming = true;
+      //  if ($rootScope.platformOS == 'ios')
+        //    $scope.loginData.disableSimulStreaming = true;
     };
     //------------------------------------------------------------------
     // Perform the login action when the user submits the login form
@@ -113,9 +121,7 @@ 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