thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Synced with ScummVM - rev: d4db631f9b

Browse source
This commit is contained in:
Pawel Kolodziejski 2020-09-23 21:52:10 +02:00
parent 3505ece7ed
commit bfe58d3c77
42 changed files with 486 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/keymapper/keymap.cpp
View file

@ -365,10 +365,12 @@ bool Keymap::areMappingsIdentical(const Array<HardwareInput> &mappingsA, const S
// Assumes array values are not duplicated, but registerMapping and addDefaultInputMapping ensure that
uint foundCount = 0;
uint validDefaultMappings = 0;
for (uint i = 0; i < mappingsB.size(); i++) {
// We resolve the hardware input to make sure it is not a default for some hardware we don't have currently
HardwareInput mappingB = _hardwareInputSet->findHardwareInput(mappingsB[i]);
if (mappingB.type == kHardwareInputTypeInvalid) continue;
validDefaultMappings++;
for (uint j = 0; j < mappingsA.size(); j++) {
if (mappingsA[j].id == mappingB.id) {
@ -378,7 +380,7 @@ bool Keymap::areMappingsIdentical(const Array<HardwareInput> &mappingsA, const S
}
}
return foundCount == mappingsA.size();
return foundCount == mappingsA.size() && foundCount == validDefaultMappings;
}
} // End of namespace Common