From adaaec08f156c45a06f76741d12a437b32a36053 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 11 May 2020 09:37:21 -0400 Subject: disregard state transition before init is complete --- www/js/NVR.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'www/js/NVR.js') 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."); } -- cgit v1.2.3