From 70c87f0db9b273b033fc7d404137f640f7d6f66f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 May 2021 09:12:43 -0700
Subject: [PATCH] Fix #124240

---
 .../src/features/validationProvider.ts        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/extensions/php-language-features/src/features/validationProvider.ts b/extensions/php-language-features/src/features/validationProvider.ts
index 162efdaa787..fb4111c874b 100644
--- a/extensions/php-language-features/src/features/validationProvider.ts
+++ b/extensions/php-language-features/src/features/validationProvider.ts
@@ -194,15 +194,17 @@ export default class PHPValidationProvider {
 			if (vscode.workspace.isTrusted) {
 				trigger();
 			}
-		} else if (this.config!.executableIsUserDefined !== undefined && !this.config!.executableIsUserDefined) {
-			const checkedExecutablePath = this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined);
-			if (!checkedExecutablePath || checkedExecutablePath !== this.config!.executable) {
-				if (await this.showCustomTrustDialog()) {
-					this.workspaceStore.update(Setting.CheckedExecutablePath, this.config!.executable);
-					vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true);
-				} else {
-					this.pauseValidation = true;
-					return;
+		} else {
+			if (this.config!.executableIsUserDefined !== undefined && !this.config!.executableIsUserDefined) {
+				const checkedExecutablePath = this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined);
+				if (!checkedExecutablePath || checkedExecutablePath !== this.config!.executable) {
+					if (await this.showCustomTrustDialog()) {
+						this.workspaceStore.update(Setting.CheckedExecutablePath, this.config!.executable);
+						vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true);
+					} else {
+						this.pauseValidation = true;
+						return;
+					}
 				}
 			}