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

Fix: check if we have to show simple menu only after we checked if we have a resume point #12674

Merged
merged 1 commit into from
Aug 16, 2017

Conversation

phate89
Copy link
Contributor

@phate89 phate89 commented Aug 14, 2017

Description

Right now we skip bd simplemenu everytime we ask for a resume doesn't matter if there is. This pr changes that. It will skip simplemenu only if there's really a resumepoint set.

Motivation and Context

Right now when we start "playdisc" builtin we ask to resume and there's a check in bd simplemenu that skips the menu if there's a resume request.
This means if you add a bd and start it with playdisc (from estuary main page for example) you won't ever get the bd simplemenu even if you set it and it will start to play directly the bluray. It's a problem that already exists in krypton but in leia it will even be worse because instead of loading the default playlist it will try to load the bd menu with different results (not all bd menus works great)

How Has This Been Tested?

I tested with a couple of bluray and with resume points

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

@phate89 phate89 requested a review from ace20022 August 14, 2017 15:43
@phate89 phate89 added Type: Fix non-breaking change which fixes an issue v18 Leia labels Aug 14, 2017
@stefansaraev
Copy link
Contributor

system/lcms2.dll should not be part of this pr :)

@phate89
Copy link
Contributor Author

phate89 commented Aug 14, 2017

mm it keeps popping up everytime not sure why.. Fixed it :)

//check if we must show the simplified bd menu
if (!CGUIDialogSimpleMenu::ShowPlaySelection(const_cast<CFileItem&>(item)))
return PLAYBACK_CANCELED;
}

This comment was marked as spam.

This comment was marked as spam.

@ace20022
Copy link
Member

Looks, good. Thanks for the pr!

@phate89
Copy link
Contributor Author

phate89 commented Aug 15, 2017

Do you think it's worth it to backport to krypton?

@ace20022
Copy link
Member

I don't have time to test it, but I trust you that it works in all cases. Therefore +1 for a backport.

@ace20022 ace20022 merged commit a90d8f9 into xbmc:master Aug 16, 2017
@ace20022 ace20022 added this to the L 18.0-alpha1 milestone Aug 16, 2017
@phate89 phate89 deleted the fix_bd_simplemenu branch September 7, 2017 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants