[PVR] Parental check fix; Profile switch fix #13829
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
…ed' state. Adapt callers (e.g. CPVGUIACtions parental check methods) not to show error messages if dialog was canceled.
ksooo
added
Type: Fix
... well known unrelated jenkins error on LINUX-64 |
Jalle19
approved these changes
Apr 29, 2018
| @@ -172,7 +172,7 @@ namespace PVR | |||
| bool CPVRGUIActions::ShowEPGInfo(const CFileItemPtr &item) const | |||
| { | |||
| const CPVRChannelPtr channel(CPVRItem(item).GetChannel()); | |||
| if (channel && !CheckParentalLock(channel)) | |||
| if (channel && CheckParentalLock(channel) != ParentalCheckResult::SUCCESS) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Can you also fix deadlock when clearing PVR data or epg data via settings? |
??? Please don't hijack random PRs to get attention. Use the forum or trac. Thanks. |
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.
Two fixes here:
Parental check: Do not show "wrong PIN entered" error box / do not write error log entry if user cancels out parental PIN dialog.
Profile switch: Reload PVR manager's settings on profile switch. For example "parentalenabled" value can be different for different profiles.
Changes are runtime-tested on macOS , latest Kodi master.
@Jalle19 mind taking a look. Changes are straight forward, I guess.