Fixes #66548: Avoid double async-calls

b4105815 · Dirk Baeumer · bc6bc84e · b4105815
隐藏空白更改
内联并排

Showing with 8 addition and 12 deletion

src/main.js src/main.js +8 -12

未找到文件。
--- a/src/main.js
+++ b/src/main.js
@@ -434,20 +434,16 @@ function getUserDefinedLocale() {
 	}
 	const localeConfig = path.join(userDataPath, 'User', 'locale.json');
-	return exists(localeConfig).then((result) => {
+	return bootstrap.readFile(localeConfig).then((content) => {
-		if (result) {
+		content = stripComments(content);
-			return bootstrap.readFile(localeConfig).then((content) => {
+		try {
-				content = stripComments(content);
+			const value = JSON.parse(content).locale;
-				try {
+			return value && typeof value === 'string' ? value.toLowerCase() : undefined;
-					const value = JSON.parse(content).locale;
+		} catch (e) {
-					return value && typeof value === 'string' ? value.toLowerCase() : undefined;
-				} catch (e) {
-					return undefined;
-				}
-			});
-		} else {
 			return undefined;
 		}
+	}, () => {
+		return undefined;
 	});
 }