From f9b7bc26c0c0f8eb9e0e3f3b0203b0ceb974d5c3 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Thu, 30 May 2019 11:31:00 -0700 Subject: [PATCH] Add a null check before using settings editor options (#5756) --- .../contrib/preferences/electron-browser/settingsEditor2.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts index 4ddcaa1c19..4058ac0ba6 100644 --- a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts +++ b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts @@ -258,6 +258,11 @@ export class SettingsEditor2 extends BaseEditor { } private _setOptions(options: SettingsEditorOptions): void { + // {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref + if (!options) { + return; + } + if (options.query) { this.searchWidget.setValue(options.query); }