Merge pull request #64803 from Microsoft/joao/release/1.30/fix-64739

joaomoreno · web-flow · commit c6e592b2b577 · 2018-12-11T15:17:17.000+01:00
Fixes #64739
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -46,7 +46,8 @@ export class DarwinUpdateService extends AbstractUpdateService {
 		this.logService.error('UpdateService error:', err);
 
 		// only show message when explicitly checking for updates
-		const message: string | undefined = !!context ? err : undefined;
+		const shouldShowMessage = this.state.type === StateType.CheckingForUpdates ? !!this.state.context : true;
+		const message: string | undefined = shouldShowMessage ? err : undefined;
 		this.setState(State.Idle(UpdateType.Archive, message));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ export class DarwinUpdateService extends AbstractUpdateService {`
`46`	`46`	`this.logService.error('UpdateService error:', err);`
`47`	`47`
`48`	`48`	`// only show message when explicitly checking for updates`
`49`		`- const message: string \| undefined = !!context ? err : undefined;`
	`49`	`+ const shouldShowMessage = this.state.type === StateType.CheckingForUpdates ? !!this.state.context : true;`
	`50`	`+ const message: string \| undefined = shouldShowMessage ? err : undefined;`
`50`	`51`	`this.setState(State.Idle(UpdateType.Archive, message));`
`51`	`52`	`}`
`52`	`53`