From 8673cd2abb2d5ef19e12a753b1d7224a5c7ba4d2 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Wed, 16 Jul 2025 21:13:12 -0500 Subject: [PATCH] Re-enable web-source icons in Stable and Preview builds (#19137) Disables a controversial part of #19044. Refs #19075 (cherry picked from commit 7b841628dfd332dbd6e69a44dc1b85ec17ca5837) Service-Card-Id: PVTI_lADOAF3p4s4Axadtzgcqq7A Service-Version: 1.23 --- .../TerminalSettingsModel/CascadiaSettings.cpp | 11 ++++++++--- src/features.xml | 11 +++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index 2ac6305105..d0e4fbcf5f 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -483,9 +483,14 @@ static bool _validateSingleMediaResource(std::wstring_view resource) return false; } - const auto scheme{ resourceUri.SchemeName() }; - // Only file: URIs and ms-* URIs are permissible. http, https, ftp, gopher, etc. are not. - return til::equals_insensitive_ascii(scheme, L"file") || til::starts_with_insensitive_ascii(scheme, L"ms-"); + if constexpr (Feature_DisableWebSourceIcons::IsEnabled()) + { + const auto scheme{ resourceUri.SchemeName() }; + // Only file: URIs and ms-* URIs are permissible. http, https, ftp, gopher, etc. are not. + return til::equals_insensitive_ascii(scheme, L"file") || til::starts_with_insensitive_ascii(scheme, L"ms-"); + } + + return true; } catch (...) { diff --git a/src/features.xml b/src/features.xml index 569acb9d6e..2636fc5a1f 100644 --- a/src/features.xml +++ b/src/features.xml @@ -197,4 +197,15 @@ + + Feature_DisableWebSourceIcons + Disables icon paths that make web requests + 19075 + AlwaysDisabled + + Dev + Canary + + +