Merge pull request #3437 from NativeScript/fatme/user-settings-file

Fatme · web-flow · commit 7f021408caab · 2018-03-12T19:11:27.000+02:00
fix(userSettings): Don't fail when user settings file is not a valid json
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit f978eaf4bcec7e6564246616dae2de809504efb2
+Subproject commit 325d7a1d61ee4098be8df235b9a05687f2bdd876
diff --git a/lib/services/user-settings-service.ts b/lib/services/user-settings-service.ts
@@ -4,9 +4,10 @@ import * as userSettingsServiceBaseLib from "../common/services/user-settings-se
 class UserSettingsService extends userSettingsServiceBaseLib.UserSettingsServiceBase {
 	constructor($fs: IFileSystem,
 		$settingsService: ISettingsService,
-		$lockfile: ILockFile) {
+		$lockfile: ILockFile,
+		$logger: ILogger) {
 		const userSettingsFilePath = path.join($settingsService.getProfileDir(), "user-settings.json");
-		super(userSettingsFilePath, $fs, $lockfile);
+		super(userSettingsFilePath, $fs, $lockfile, $logger);
 	}
 
 	public async loadUserSettingsFile(): Promise<void> {
