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

* Eliminate carriage return character * Add WSLName ending identifiers.
microsoft · Jun 10, 2019 · b9d83ba · b9d83ba
1 parent 19dbec8
commit b9d83ba
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/cascadia/TerminalApp/CascadiaSettings.cpp b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -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" });