Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xbmc] Addon settings fixes #12536

Merged
merged 1 commit into from
Jul 29, 2017
Merged

Conversation

Paxxi
Copy link
Member

@Paxxi Paxxi commented Jul 20, 2017

Fix a parsing issue for new setting format where settingId would be the element name instead of the id
Fix a conversion issue where settings without category was skipped over.

This should solve log spam of creating settings on the fly for valid addons and properly save/load addons after converted to the new setting format.

@peak3d for testing.

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed

…he element name instead of the id

Fix a conversion issue where settings without category was skipped over.
@Paxxi Paxxi added Type: Fix non-breaking change which fixes an issue Component: Settings v18 Leia labels Jul 20, 2017
@Paxxi Paxxi added this to the L 18.0-alpha1 milestone Jul 20, 2017
@Paxxi Paxxi requested a review from Montellese July 20, 2017 18:02
settingId += setting->ValueStr();
auto id = setting->ToElement()->Attribute("id");
if (id)
settingId += id;

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

// build a vector of settings from the same category
std::vector<std::shared_ptr<const CSetting>> categorySettings;
std::set<std::string> settingIds;

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

Copy link
Contributor

@peak3d peak3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good exept the one minor thing

@MartijnKaijser
Copy link
Member

@Paxxi anything left or need updating?

@Paxxi
Copy link
Member Author

Paxxi commented Jul 29, 2017

Good to go @martijn. Was waiting on me looking into peaks comment but no changes are warranted there

@MartijnKaijser MartijnKaijser merged commit 8da9320 into xbmc:master Jul 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Settings Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants