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

[PVR] Trac 17246: Fix deadlock that might occur during initial channel icon search. #11536

Merged
merged 1 commit into from
Jan 25, 2017

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Jan 24, 2017

This user reported deadlock might occur on kodi startup when switching to the channels window while user supplied channel icons are still read and set.

Fixes trac 17246: http://trac.kodi.tv/ticket/17246

Stack traces (supplied by bug reporter):
kodi-frozen

Ghist of the fix is to put the problematic long running and guilib-calling (g_graphicsContext locking) channel icon search and set code into a CJob implementation.

Fix has been tested on latest master on macOS by me and using test build on Windows by the bug reporter.

@Jalle19 for review?

@ksooo ksooo added Type: Fix non-breaking change which fixes an issue Component: PVR v18 Leia labels Jan 24, 2017
@ksooo ksooo added this to the L 18.0-alpha1 milestone Jan 24, 2017
@ksooo ksooo requested a review from Jalle19 January 24, 2017 20:01
@Paxxi
Copy link
Member

Paxxi commented Jan 24, 2017

Oh that looks like an awesome visual Studio feature, must try it out.

Fix looks sane to me

Copy link
Member

@Jalle19 Jalle19 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 to me

@ksooo
Copy link
Member Author

ksooo commented Jan 25, 2017

jenkins build this please

@ksooo ksooo merged commit d73ae2b into xbmc:master Jan 25, 2017
@ksooo ksooo deleted the pvr-fix-channeliconsearch-deadlock branch January 25, 2017 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport: Done Component: PVR 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