Fix settings refresh

Levminer · Apr 8, 2022 · 67c874f · 67c874f
1 parent 9342a06
commit 67c874f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/app/application/src/js/index.js b/app/application/src/js/index.js
@@ -48,14 +48,16 @@ let settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "se
 /**
  * Refresh settings
  */
-if (settings.security.require_password !== null) {
+if (settings.security.require_password === null && settings.security.password === null) {
 	const settings_refresher = setInterval(() => {
 		try {
 			settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "settings.json"), "utf-8"))
 
-			clearInterval(settings_refresher)
+			if (settings.security.require_password !== null || settings.security.password !== null) {
+				clearInterval(settings_refresher)
+			}
 		} catch (error) {
-			logger.error("Error refreshing settings and storage")
+			logger.error("Error refreshing settings")
 			clearInterval(settings_refresher)
 		}
 	}, 100)

diff --git a/app/edit/src/js/index.js b/app/edit/src/js/index.js
@@ -47,14 +47,16 @@ let settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "se
 /**
  * Refresh settings
  */
-if (settings.security.require_password !== null) {
+if (settings.security.require_password === null && settings.security.password === null) {
 	const settings_refresher = setInterval(() => {
 		try {
 			settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "settings.json"), "utf-8"))
 
-			clearInterval(settings_refresher)
+			if (settings.security.require_password !== null || settings.security.password !== null) {
+				clearInterval(settings_refresher)
+			}
 		} catch (error) {
-			logger.error("Error refreshing settings and storage")
+			logger.error("Error refreshing settings")
 			clearInterval(settings_refresher)
 		}
 	}, 500)

diff --git a/app/export/src/js/index.js b/app/export/src/js/index.js
@@ -71,14 +71,16 @@ let settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "se
 /**
  * Refresh settings
  */
-if (settings.security.require_password !== null) {
+if (settings.security.require_password === null && settings.security.password === null) {
 	const settings_refresher = setInterval(() => {
 		try {
 			settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "settings.json"), "utf-8"))
 
-			clearInterval(settings_refresher)
+			if (settings.security.require_password !== null || settings.security.password !== null) {
+				clearInterval(settings_refresher)
+			}
 		} catch (error) {
-			logger.error("Error refreshing settings and storage")
+			logger.error("Error refreshing settings")
 			clearInterval(settings_refresher)
 		}
 	}, 500)

diff --git a/app/settings/src/js/index.js b/app/settings/src/js/index.js
@@ -71,14 +71,16 @@ let settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "se
 /**
  * Refresh settings
  */
-if (settings.security.require_password !== null) {
+if (settings.security.require_password === null && settings.security.password === null) {
 	const settings_refresher = setInterval(() => {
 		try {
 			settings = JSON.parse(fs.readFileSync(path.join(folder_path, "settings", "settings.json"), "utf-8"))
 
 			/** @type{LibStorage} */ storage = dev ? JSON.parse(localStorage.getItem("dev_storage")) : JSON.parse(localStorage.getItem("storage"))
 
-			clearInterval(settings_refresher)
+			if (settings.security.require_password !== null || settings.security.password !== null) {
+				clearInterval(settings_refresher)
+			}
 		} catch (error) {
 			logger.error("Error refreshing settings and storage")
 			clearInterval(settings_refresher)