BugFix: correct merge error from #4604#4693
Merged
SlySven merged 1 commit intoMudlet:developmentfrom Jan 26, 2021
Merged
Conversation
Due to some differences in local variable names I did not spot that I was introducing two copies of the same functional code into the method that scanned the existing map file in other inactive profiles for when a new shared map was copied over to them. As such the code (in `(bool) TMap::retrieveMapFileStats(...)` would not have been used very much in the last couple of weeks when it was in the development branch code and even then it may not have prevented the current usage of that method from having functioned correctly. Nevertheless it is defective as it is and this PR removes one copy of the duplicated code. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
|
Hey there! Thanks for helping Mudlet improve. 🌟 Test versionsYou can directly test the changes here:
No need to install anything - just unzip and run. |
vadi2
approved these changes
Jan 26, 2021
SlySven
added a commit
to SlySven/Mudlet
that referenced
this pull request
Jan 26, 2021
…sion In creating Mudlet#4693 I chose the opposite duplicate chunk of code that I was using in this PR - since there was slight differences it would have impacted when this PR is merged. This commit swaps things so that it uses the same code as will be in the development branch in the near future. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Chris7
pushed a commit
to Chris7/Mudlet
that referenced
this pull request
Jan 2, 2022
Due to some differences in local variable names I did not spot that I was introducing two copies of the same functional code into the method that scanned the existing map file in other inactive profiles for when a new shared map was copied over to them. As such the code (in `(bool) TMap::retrieveMapFileStats(...)` would not have been used very much in the last couple of weeks when it was in the development branch code and even then it may not have prevented the current usage of that method from having functioned correctly. Nevertheless it is defective as it is and this PR removes one copy of the duplicated code. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Due to some differences in local variable names I did not spot that I was introducing two copies of the same functional code into the method that scanned the existing map file in other inactive profiles for when a new shared map was copied over to them. As such the code (in
(bool) TMap::retrieveMapFileStats(...)would not have been used very much in the last couple of weeks when it was in the development branch code and even then it may not have prevented the current usage of that method from having functioned correctly. Nevertheless it is defective as it is and this PR removes one copy of the duplicated code.Signed-off-by: Stephen Lyons slysven@virginmedia.com