Don't add duplicate options to the page #37548
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
ZhilkinSerg
added
[C++]
codemime
reviewed
Jan 30, 2020
| @@ -135,7 +135,14 @@ void options_manager::addOptionToPage( const std::string &name, const std::strin | |||
| { | |||
| for( Page &p : pages_ ) { | |||
| if( p.id_ == page ) { | |||
| // Don't add duplicate options to the page | |||
| for( const cata::optional<std::string> &i : p.items_ ) { | |||
| if( i.has_value() && i.value() == name ) { | |||
There was a problem hiding this comment.
Shouldn't duplicates be handled in the calling code? I mean something tries to add duplicate entries and that's weird.
There was a problem hiding this comment.
Well, yes, DISPLAY option is added both through find_videodisplays and add_graphic_options.
We can probably go with RENDERER option way as an alternative.
ZhilkinSerg
force-pushed
the
fix-options-duplicates
branch
from
8683354
to
3a1dcc8
Compare
This was referenced Feb 2, 2020
This was referenced Feb 16, 2020
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
SUMMARY: NonePurpose of change
Fixes #37534
Describe the solution
Check for duplicates before adding options to the their page.
Testing
Go to
Optionsmenu and see thatDisplayoption onGraphicstab is not duplicated anymore.Additional context
While I am there, I've also added early return, so we don't iterate remaining pages once required page is found.