Fix the shortcut loading too

fixes #2319
microsoft · Sep 3, 2019 · a6cccea · a6cccea
1 parent 3d95ee8
commit a6cccea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/src/propsheet/console.cpp b/src/propsheet/console.cpp
@@ -97,7 +97,7 @@ void SaveConsoleSettingsIfNeeded(const HWND hwnd)
         if (gpStateInfo->LinkTitle != NULL)
         {
             SetGlobalRegistryValues();
-            if (!NT_SUCCESS(ShortcutSerialization::s_SetLinkValues(gpStateInfo, g_fEastAsianSystem, g_fForceV2)))
+            if (!NT_SUCCESS(ShortcutSerialization::s_SetLinkValues(gpStateInfo, g_fEastAsianSystem, g_fForceV2, g_fLaunchedAsV2)))
             {
                 WCHAR szMessage[MAX_PATH + 100];
                 WCHAR awchBuffer[MAX_PATH] = { 0 };

diff --git a/src/propsheet/registry.cpp b/src/propsheet/registry.cpp
@@ -950,6 +950,7 @@ VOID SetRegistryValues(
     // Only save the "Terminal" settings if we launched as a v2 propsheet. The
     // v1 console doesn't know anything about these settings, and their value
     // will be incorrectly zero'd if we save in this state.
+    // See microsoft/terminal#2319 for more details.
     if (g_fLaunchedAsV2)
     {
         // Save cursor type and color

diff --git a/src/propslib/ShortcutSerialization.cpp b/src/propslib/ShortcutSerialization.cpp
@@ -418,7 +418,8 @@ Return Value:
 */
 [[nodiscard]] NTSTATUS ShortcutSerialization::s_SetLinkValues(_In_ PCONSOLE_STATE_INFO pStateInfo,
                                                               const BOOL fEastAsianSystem,
-                                                              const BOOL fForceV2)
+                                                              const BOOL fForceV2,
+                                                              const bool writeTerminalSettings)
 {
     IShellLinkW* psl;
     IPersistFile* ppf;
@@ -488,12 +489,21 @@ Return Value:
                     s_SetLinkPropertyBoolValue(pps, PKEY_Console_CtrlKeyShortcutsDisabled, pStateInfo->fCtrlKeyShortcutsDisabled);
                     s_SetLinkPropertyBoolValue(pps, PKEY_Console_LineSelection, pStateInfo->fLineSelection);
                     s_SetLinkPropertyByteValue(pps, PKEY_Console_WindowTransparency, pStateInfo->bWindowTransparency);
-                    s_SetLinkPropertyDwordValue(pps, PKEY_Console_CursorType, pStateInfo->CursorType);
-                    s_SetLinkPropertyDwordValue(pps, PKEY_Console_CursorColor, pStateInfo->CursorColor);
                     s_SetLinkPropertyBoolValue(pps, PKEY_Console_InterceptCopyPaste, pStateInfo->InterceptCopyPaste);
-                    s_SetLinkPropertyDwordValue(pps, PKEY_Console_DefaultForeground, pStateInfo->DefaultForeground);
-                    s_SetLinkPropertyDwordValue(pps, PKEY_Console_DefaultBackground, pStateInfo->DefaultBackground);
-                    s_SetLinkPropertyBoolValue(pps, PKEY_Console_TerminalScrolling, pStateInfo->TerminalScrolling);
+
+                    // Only save the "Terminal" settings if we launched as a v2
+                    // propsheet. The v1 console doesn't know anything about
+                    // these settings, and their value will be incorrectly
+                    // zero'd if we save in this state.
+                    // See microsoft/terminal#2319 for more details.
+                    if (writeTerminalSettings)
+                    {
+                        s_SetLinkPropertyDwordValue(pps, PKEY_Console_CursorType, pStateInfo->CursorType);
+                        s_SetLinkPropertyDwordValue(pps, PKEY_Console_CursorColor, pStateInfo->CursorColor);
+                        s_SetLinkPropertyDwordValue(pps, PKEY_Console_DefaultForeground, pStateInfo->DefaultForeground);
+                        s_SetLinkPropertyDwordValue(pps, PKEY_Console_DefaultBackground, pStateInfo->DefaultBackground);
+                        s_SetLinkPropertyBoolValue(pps, PKEY_Console_TerminalScrolling, pStateInfo->TerminalScrolling);
+                    }
                     hr = pps->Commit();
                     pps->Release();
                 }

diff --git a/src/propslib/ShortcutSerialization.hpp b/src/propslib/ShortcutSerialization.hpp
@@ -24,7 +24,7 @@ Revision History:
 class ShortcutSerialization
 {
 public:
-    [[nodiscard]] static NTSTATUS s_SetLinkValues(_In_ PCONSOLE_STATE_INFO pStateInfo, const BOOL fEastAsianSystem, const BOOL fForceV2);
+    [[nodiscard]] static NTSTATUS s_SetLinkValues(_In_ PCONSOLE_STATE_INFO pStateInfo, const BOOL fEastAsianSystem, const BOOL fForceV2, const bool writeTerminalSettings);
     [[nodiscard]] static NTSTATUS s_GetLinkConsoleProperties(_Inout_ PCONSOLE_STATE_INFO pStateInfo);
     [[nodiscard]] static NTSTATUS s_GetLinkValues(_Inout_ PCONSOLE_STATE_INFO pStateInfo,
                                                   _Out_ BOOL* const pfReadConsoleProperties,