Remove carriage return from WSL distribution names. #1169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull in updates 07 Jun 19
dz333n
approved these changes
Jun 8, 2019
zadjii-msft
approved these changes
Jun 9, 2019
zadjii-msft
reviewed
Jun 10, 2019
| @@ -534,7 +534,11 @@ 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"( "); | |||
There was a problem hiding this comment.
I'd definitely leave a comment referring back to #1168 about how we need to make sure to stop the name at a parentheses, since "(default)" might be included in the output
Co-Authored-By: Mike Griese <migrie@microsoft.com>
DHowett-MSFT
approved these changes
Jun 10, 2019
Removed spacing. Co-Authored-By: Dustin L. Howett (MSFT) <duhowett@microsoft.com>
Removed Spacing Co-Authored-By: Dustin L. Howett (MSFT) <duhowett@microsoft.com>
|
Thanks for fixing this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of the Pull Request
Checks the Distribution name for
\rand removes it if necessary.References
#1168
PR Checklist
Detailed Description of the Pull Request / Additional comments
One line to check for and remove any carriage return characters.
Validation Steps Performed
I've installed a second distribution and tested this to ensure that it now functions properly.