settings: fix conflict of <minimum> and <maximum> for CSettingList #4308

Merged
merged 1 commit into from Mar 7, 2014

Projects

None yet

3 participants

@Montellese
Member

While working on the settings system a bit I noticed that there is a conflict in CSettingList. It uses and to specify the minimum/maxmimum number of items in the list. But the same tags are read by the setting definition (e.g. CSettingInt for a setting of type "list[integer]") and used for the minimum/maximum value of the setting. Obviously this leads to unexpected conflicts.

I renamed the and tags of CSettingList to and to avoid this problem.

@MartijnKaijser MartijnKaijser added this to the Pending for inclusion milestone Mar 3, 2014
@jmarshallnz
Member

@Montellese any reason this needs to be Gotham?

@Montellese
Member

There's no setting right now that runs into this conflict so it's not a 100% must. But it certainly is a bug.

@jmarshallnz
Member

Ok. jenkins build this please.

@jmarshallnz jmarshallnz added the Gotham label Mar 3, 2014
@Montellese Montellese added the Fix label Mar 4, 2014
@Montellese
Member

@jmarshallnz: Does this mean Gotham or Gotham + 1? Just so I can adjust the label and milestone on the PR if necessary.

@jmarshallnz jmarshallnz merged commit 74588b9 into xbmc:master Mar 7, 2014

1 check passed

default Merged build #315 succeeded in 54 min
Details
@jmarshallnz
Member

Gotham.

@Montellese
Member

Should I make a pull request against Gotham or will you cherry-pick the commit?

@jmarshallnz
Member

Up to you :)

@Montellese Montellese deleted the Montellese:settinglist_minmax_conflict branch Mar 7, 2014
@jmarshallnz jmarshallnz removed the Gotham label Mar 8, 2014
@Montellese Montellese removed this from the Helix 14.0-alpha1 milestone Apr 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment