maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove carriage return and () from WSL distro names (#1169)

Browse source 
* Eliminate carriage return character
* Add WSLName ending identifiers.
This commit is contained in:
Jeremy Banks 2019-06-10 16:38:18 -04:00 committed by Dustin L. Howett (MSFT)
parent 19dbec8c33
commit b9d83baaeb
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cascadia/TerminalApp/CascadiaSettings.cpp
View file

@ -534,7 +534,14 @@ void CascadiaSettings::_AppendWslProfiles(std::vector<TerminalApp::Profile>& 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" });