Fix microsoft#60455 - handle canceled local search before remote search

roblourens · roblourens · commit d3d3236565e0 · 2018-10-10T11:59:57.000-07:00
diff --git a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
@@ -1176,7 +1176,7 @@ export class SettingsEditor2 extends BaseEditor {
 		return this.localSearchDelayer.trigger(() => {
 			if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
 				return this.localFilterPreferences(query).then(result => {
-					if (!result.exactMatch) {
+					if (result && !result.exactMatch) {
 						this.remoteSearchThrottle.trigger(() => {
 							return searchInProgress && !searchInProgress.token.isCancellationRequested ?
 								this.remoteSearchPreferences(query, this.searchInProgress.token) :
