summaryrefslogtreecommitdiff
path: root/www/js/NVR.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2020-05-11 09:37:21 -0400
committerPliable Pixels <pliablepixels@gmail.com>2020-05-11 09:37:21 -0400
commitadaaec08f156c45a06f76741d12a437b32a36053 (patch)
treefd96e07b8a490fc834bee6b932f18fadaa838cd6 /www/js/NVR.js
parent1c4d642f737365dbece72dda22d4c32097cb62e3 (diff)
disregard state transition before init is complete
Diffstat (limited to 'www/js/NVR.js')
-rw-r--r--www/js/NVR.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 32c605cb..c09c37f0 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -36,7 +36,9 @@ angular.module('zmApp.controllers')
var zmgroups = [];
var multiservers = [];
+
var migrationComplete = false;
+ $rootScope.initComplete = false; // will be true when init is fully done to take care of spurious state changes at times
var tz = "";
var isTzSupported = false;
@@ -2371,9 +2373,11 @@ angular.module('zmApp.controllers')
if (!isEmpty(loadedData)) {
loginData = loadedData;
_checkInitSanity(loginData);
- log("NVR init retrieved store loginData");
+ log("NVR init retrieved store loginData, marking init as complete");
+ $rootScope.initComplete = true;
+
} else {
- log("defaultServer configuration NOT found. Keeping login at defaults");
+ log("defaultServer configuration NOT found. Keeping login at defaults. Marking init as complete.");
}