Fix line ending bug for downloaded gecko codes #2539
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
|
LGTM |
| @@ -192,6 +192,9 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) | |||
|
|
|||
| while ((std::getline(ss, line).good())) | |||
| { | |||
| // Remove \r at the end of the line for files using windows line endings, std::getline only removes \n | |||
| line = StripSpaces(line); | |||
|
|
|||
| // empty line | |||
| if (0 == line.size() || line == "\r" || line == "\n") // \r\n checks might not be needed | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
mimimi085181
force-pushed
the
gecko-codes-line-ending-fix
branch
from
1a7c632
to
e686bfe
Compare
| // empty line | ||
| if (0 == line.size() || line == "\r" || line == "\n") // \r\n checks might not be needed | ||
| if (0 == line.size()) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Updated: Removed the unnecessary check for lines consisting only of \r, which can't happen anymore. |
mimimi085181
force-pushed
the
gecko-codes-line-ending-fix
branch
from
e686bfe
to
bd5e55b
Compare
|
@dolphin-emu-bot rebuild |
|
FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:
automated-fifoci-reporter |
|
LGTM |
comex
added a commit
that referenced
this pull request
Jun 7, 2015
Fix line ending bug for downloaded gecko codes
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.
Gecko codes .txt files that contain windows style line endings result in mixed line endings for the generated .ini file(\r\r\n) when using Windows. This PR removes some single \r at the end of lines. The generated file uses the line ending style from the running OS, so in case of Windows, it's generating files with \r\n line endings.
Tested on Windows, some confirmation that this generates proper unix line endings on linux would be nice. Test example was Wii Sports Resort PAL.