From 1f6164a0ca5ca705a6cbeb4707a39cff0d875848 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Mon, 12 Aug 2019 14:52:37 -0700
Subject: [PATCH] Fix resultSerializer to correctly check returned file picker
 path (#6713)

---
 src/sql/workbench/parts/query/common/resultSerializer.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sql/workbench/parts/query/common/resultSerializer.ts b/src/sql/workbench/parts/query/common/resultSerializer.ts
index 66c608a80b..77ade3cf4a 100644
--- a/src/sql/workbench/parts/query/common/resultSerializer.ts
+++ b/src/sql/workbench/parts/query/common/resultSerializer.ts
@@ -130,7 +130,7 @@ export class ResultSerializer {
 	}
 
 
-	private promptForFilepath(format: SaveFormat, resourceUri: string): Thenable<string> {
+	private promptForFilepath(format: SaveFormat, resourceUri: string): Thenable<string | undefined> {
 		let filepathPlaceHolder = prevSavePath ? path.dirname(prevSavePath) : resolveCurrentDirectory(resourceUri, this.rootPath);
 		if (filepathPlaceHolder) {
 			filepathPlaceHolder = path.join(filepathPlaceHolder, this.getResultsDefaultFilename(format));
@@ -141,8 +141,11 @@ export class ResultSerializer {
 			defaultUri: filepathPlaceHolder ? URI.file(filepathPlaceHolder) : undefined,
 			filters: this.getResultsFileExtension(format)
 		}).then(filePath => {
-			prevSavePath = filePath.fsPath;
-			return filePath.fsPath;
+			if (filePath) {
+				prevSavePath = filePath.fsPath;
+				return filePath.fsPath;
+			}
+			return undefined;
 		});
 	}