From b9d83baaeb149410dc8e520ec829eb891b2087a7 Mon Sep 17 00:00:00 2001 From: Jeremy Banks Date: Mon, 10 Jun 2019 16:38:18 -0400 Subject: [PATCH] Remove carriage return and () from WSL distro names (#1169) * Eliminate carriage return character * Add WSLName ending identifiers. --- src/cascadia/TerminalApp/CascadiaSettings.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp index 9262df2581..4846e4b895 100644 --- a/src/cascadia/TerminalApp/CascadiaSettings.cpp +++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp @@ -534,7 +534,14 @@ void CascadiaSettings::_AppendWslProfiles(std::vector& pro if (wlinestream) { std::wstring distName; - std::getline(wlinestream, distName, L' '); + std::getline(wlinestream, distName, L'\r'); + size_t firstChar = distName.find_first_of(L"( "); + // Some localizations don't have a space between the name and "(Default)" + // https://github.com/microsoft/terminal/issues/1168#issuecomment-500187109 + if (firstChar < distName.size()) + { + distName.resize(firstChar); + } auto WSLDistro{ _CreateDefaultProfile(distName) }; WSLDistro.SetCommandline(L"wsl.exe -d " + distName); WSLDistro.SetColorScheme({ L"Campbell" });