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

[xbmc][gui][fix] Fix odd labels in dialogs #7484

Merged
merged 1 commit into from
Jul 11, 2015

Conversation

Paxxi
Copy link
Member

@Paxxi Paxxi commented Jul 11, 2015

Overload resolution made the wrong method get called with a label id rather than a timeout.
Removed default params as it made it very fragile which method actually got called

@Paxxi Paxxi added the Type: Fix non-breaking change which fixes an issue label Jul 11, 2015
@Paxxi
Copy link
Member Author

Paxxi commented Jul 11, 2015

@phil65 review
jenkins build this please

@Paxxi
Copy link
Member Author

Paxxi commented Jul 11, 2015

jenkins build and merge

@Paxxi
Copy link
Member Author

Paxxi commented Jul 11, 2015

Build failure unrelated.

Paxxi added a commit that referenced this pull request Jul 11, 2015
[xbmc][gui][fix] Fix odd labels in dialogs
@Paxxi Paxxi merged commit f1d68dd into xbmc:master Jul 11, 2015
@Paxxi Paxxi deleted the fix_dialog_timeout branch July 11, 2015 19:21
@MartijnKaijser MartijnKaijser added this to the J**** 16.0-alpha1 milestone Jul 11, 2015
@@ -33,6 +33,11 @@ class CGUIDialogYesNo :
virtual bool OnMessage(CGUIMessage& message);
virtual bool OnBack(int actionID);

enum TimeOut
{

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants