diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/app.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 53a79ecd..f46508f3 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -324,7 +324,7 @@ angular.module('zmApp.controllers') function findFirstReachableUrl (urls) { - if (urls.length > 0) + if (urls.length > 0 && $rootScope.userCancelledAuth != true) { $ionicLoading.show({template: 'trying ' + urls[0].server}); zmLog ("Reachability test.." + urls[0].url); diff --git a/www/js/app.js b/www/js/app.js index dca1aa6e..be606515 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1107,6 +1107,7 @@ angular.module('zmApp', [ disableBack: true }); $rootScope.userCancelledAuth = true; + window.stop(); $state.go("login" ,{"wizard": false}); }; |