diff options
| -rw-r--r-- | www/js/app.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/www/js/app.js b/www/js/app.js index b30da6be..d954efd6 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -856,8 +856,11 @@ angular.module('zmApp', [ function doLogin(str) { + var d = $q.defer(); + + NVRDataModel.processFastLogin() // coming here means login not needed, old login is valid .then(function(success) @@ -881,6 +884,13 @@ angular.module('zmApp', [ } + if ($rootScope.isDownloading) + { + NVRDataModel.log("Skipping login process as we are downloading..."); + d.resolve("success"); + return d.promise; + } + NVRDataModel.debug("Resetting zmCookie..."); $rootScope.zmCookie = ''; // first try to login, if it works, good @@ -1674,6 +1684,7 @@ angular.module('zmApp', [ document.addEventListener("resume", function() { NVRDataModel.log("App is resuming from background"); + $rootScope.isDownloading = false; var forceDelay = NVRDataModel.getLogin().resumeDelay; NVRDataModel.log(">>> Resume delayed for " + forceDelay + " ms, to wait for network stack..."); |