#704 make sure all state gos are after getMonitor returns - in case

ZoneMinder · Sep 13, 2018 · b4912a7 · b4912a7
1 parent b8c72c8
commit b4912a7
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/www/js/MenuController.js b/www/js/MenuController.js
@@ -145,20 +145,25 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
                         },
                         function (error) {
-                          var refresh = NVRDataModel.getMonitors(1);
-                          console.log ("+++ state go after API version error: "+error);
-                          $rootScope.apiVersion = "0.0.0";
-                          NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                          var refresh = NVRDataModel.getMonitors(1)
+                          .then (function() {
+                            console.log ("+++ state go after API version error: "+error);
+                            $rootScope.apiVersion = "0.0.0";
+                            NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
+
+                            $ionicHistory.nextViewOptions({
+                              disableBack: true
+                            });
+
+
+                            $state.go('app.refresh', {
+                              "view": $state.current.name
+                            });
+                            return;
 
-                          $ionicHistory.nextViewOptions({
-                            disableBack: true
                           });
 
 
-                          $state.go('app.refresh', {
-                            "view": $state.current.name
-                          });
-                          return;
 
                         });
 
@@ -192,17 +197,21 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
                         },
                         function (error) {
-                          var refresh = NVRDataModel.getMonitors(1);
-                          $rootScope.apiVersion = "0.0.0";
-                          NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
-                          $ionicHistory.nextViewOptions({
-                            disableBack: true
-                          });
-                          console.log ("+++ state go after API version force");
-                          $state.go('app.refresh', {
-                            "view": $state.current.name
+                          var refresh = NVRDataModel.getMonitors(1)
+                          .then (function() {
+                            $rootScope.apiVersion = "0.0.0";
+                            NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                            $ionicHistory.nextViewOptions({
+                              disableBack: true
+                            });
+                            console.log ("+++ state go after API version force");
+                            $state.go('app.refresh', {
+                              "view": $state.current.name
+                            });
+                            return;
+
                           });
-                          return;
+
                         });
 
                   });