Two settings related fixes #4173

Merged
merged 3 commits into from Feb 11, 2014

Conversation

Projects
None yet
3 participants
Owner

Montellese commented Feb 8, 2014

Thanks to #4172 I've found a bug in the code of ISettingsHandler with the OnSettingsSaved() method. It doesn't make sense to define that method as const as it is used to read the changed settings and adjust something or to save additional settings (as is the case with profiles.xml). This fixes saving the master lockcode in profiles.xml after it has been changed in Settings -> System -> Master lock.
Furthermore the "masterlock.lockcode" setting is defined as a string setting (because I thought that's where the master lockcode is stored) but it should actually be an action setting as the master lockcode value is stored in profiles.xml and not in guisettings.xml.

Furthermore I've noticed that when <> is set in advancedsettings.xml we hide the "debug.showloginfo" setting but we didn't hide it's child setting "debug.setextraloglevel" which is then disabled and can't be accessed anyway.

MartijnKaijser added this to the Pending for inclusion milestone Feb 9, 2014

Montellese added some commits Feb 8, 2014

@Montellese Montellese settings: also hide "debug.setextraloglevel" when logging is set in a…
…dvancedsettings.xml
7e653a4
@Montellese Montellese settings: "masterlock.lockcode" is an action setting and not a string…
… setting
7cb8812
@Montellese Montellese settings: fix ISettingsHandler::OnSettingsSaved() definition
This fixes profile settings not being saved when when normal settings are saved
and prevents the Master lockcode from being saved to profiles.xml after it has
been changed in Settings -> System -> Master lock.
abca7fe
Owner

Montellese commented Feb 10, 2014

jenkins build this please

Contributor

t-nelson commented Feb 10, 2014

Thanks!

@t-nelson t-nelson added a commit that referenced this pull request Feb 11, 2014

@t-nelson t-nelson Merge pull request #4173 from Montellese/settings_fixes
Two settings related fixes
73371a9

@t-nelson t-nelson merged commit 73371a9 into xbmc:master Feb 11, 2014

1 check passed

default Merged build #183 succeeded in 1 hr 34 min
Details

Montellese deleted the Montellese:settings_fixes branch Feb 11, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment