diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 673740ff..90cf13e9 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -2905,10 +2905,12 @@ angular.module('zmApp.controllers') } }) .then(function (succ) { + $ionicLoading.hide(); d.resolve(true); return d.promise; }, function (err) { + $ionicLoading.hide(); d.resolve(true); return d.promise; }); diff --git a/www/js/app.js b/www/js/app.js index f0ca9ffe..1e862fd0 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1754,7 +1754,7 @@ angular.module('zmApp', [ if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" ) { //console.log("State transition is authorized"); - if (toState.name != "app.refresh") { + if (toState.name != "app.refresh" && toState.name != "app.first-use") { NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState)); localforage.setItem('last-desktop-state', { |