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.
This factors out the state tracking to a separate class. The class performs locking internally so the caller doesn't need to bother with it.
The second commit adds calls to WaitForState() to the various getters XBMC calls during initialization. This default timeout is taken from the response timeout setting. This should prevent XBMC from fetching channels (and other things) before the client has actually loaded them all, which would otherwise cause missing channels.
@adamsutton the implementation of WaitForState() isn't exactly pretty but it seems to do the job. I have not tested this on Windows yet, could be that we need to include a platform header which defines usleep().