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 loss of control if A becomes unmapped #65

Merged
merged 2 commits into from Nov 18, 2016

Conversation

@garbear
Copy link
Member

commented Nov 16, 2016

When a feature is updated, it might conflict with an existing feature. Instead of erasing the existing feature, an attempt is made to update its primitives to the old feature being overwritten.

For example, if the button map is:

A -> 0
B -> 1

And the user maps "B -> 0", then the new button map will look like:

A -> 1
B -> 0

Here, instead of erasing the A (button 0) when it conflicts with the new B (also button 0), the A is updated to point to B's old button (1).

Part of xbmc/xbmc#10630

garbear added 2 commits Nov 16, 2016
When a feature is updated, it might conflict with an existing feature.
Instead of erasing the existing feature, an attempt is made to update its
primitives to the old feature being overwritten.

For example, if the button map is:

A -> 0
B -> 1

And the user maps "B -> 0", then the new button map will look like:

A -> 1
B -> 0

Here, instead of erasing the A (button 0) when it conflicts with the new
B (also button 0), the A is updated to point to B's old button (1).
@garbear garbear referenced this pull request Nov 16, 2016
18 of 26 tasks complete
@a1rwulf

This comment has been minimized.

Copy link
Member

commented Nov 16, 2016

Looks good to me.
Nice feature btw :)

@garbear garbear merged commit 5074c74 into xbmc:master Nov 18, 2016
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@garbear garbear deleted the kodi-game:fix-unmapped branch Nov 18, 2016
@garbear garbear referenced this pull request Feb 2, 2017
96 of 123 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.