Merge remote-tracking branch 'origin/master' into tyriar/nsfw

437afcac · Daniel Imms · 7ffcc198 · be554911 · 437afcac
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/vs/workbench/services/textfile/common/textFileService.ts src/vs/workbench/services/textfile/common/textFileService.ts +1 -1

未找到文件。
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -342,7 +342,7 @@ export abstract class TextFileService implements ITextFileService {
 		}

 		// Hot exit
-		const hotExitMode = configuration && configuration.files && configuration.files.hotExit;
+		const hotExitMode = configuration && configuration.files ? configuration.files.hotExit : HotExitConfiguration.OFF;
 		if (hotExitMode === HotExitConfiguration.OFF || hotExitMode === HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE) {
 			this.configuredHotExit = hotExitMode;
 		} else {