[silmarillion] Yikes I've really had a hard time with this.

microsoft · Mar 29, 2023 · 3152ff9 · 3152ff9
1 parent ef4651a
commit 3152ff9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -763,7 +763,7 @@
     <comment>{Locked="newTabMenu"} {Locked="remainingProfiles"}</comment>
   </data>
   <data name="InvalidUseOfContent" xml:space="preserve">
-    <value>The "__content" property is reserved for internal use. Ignoring that value from any actions that have it set.</value>
+    <value>The "__content" property is reserved for internal use</value>
     <comment>{Locked="__content"}</comment>
   </data>
   <data name="AboutToolTip" xml:space="preserve">

diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h
@@ -456,7 +456,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             // settings. That's an internal-use-only property.
             if (args->_TerminalArgs.ContentId())
             {
-                args->_TerminalArgs.ContentId(0);
                 return { *args, { SettingsLoadWarnings::InvalidUseOfContent } };
             }
             return { *args, {} };
@@ -543,7 +542,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             // settings. That's an internal-use-only property.
             if (args->_TerminalArgs.ContentId())
             {
-                args->_TerminalArgs.ContentId(0);
                 return { *args, { SettingsLoadWarnings::InvalidUseOfContent } };
             }
 
@@ -611,7 +609,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             // settings. That's an internal-use-only property.
             if (args->_TerminalArgs.ContentId())
             {
-                args->_TerminalArgs.ContentId(0);
                 return { *args, { SettingsLoadWarnings::InvalidUseOfContent } };
             }