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

KEYMAPPER: Remove action id length restriction

Browse source
This commit is contained in:
Bastien Bouclet 2017-08-11 14:19:41 +02:00
parent b7a816f1eb
commit a449b87c5d
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/keymapper/keymap.cpp
View file

@ -74,7 +74,7 @@ const HardwareInput *Keymap::getActionMapping(Action *action) const {
const Action *Keymap::findAction(const char *id) const {
for (ActionList::const_iterator it = _actions.begin(); it != _actions.end(); ++it) {
if (strncmp((*it)->id, id, ACTION_ID_SIZE) == 0)
if (strcmp((*it)->id, id) == 0)
return *it;
}
@ -131,13 +131,7 @@ void Keymap::saveMappings() {
const Action *action = it->_value;
const HardwareInput *input = it->_key;
uint actIdLen = strlen(action->id);
actIdLen = (actIdLen > ACTION_ID_SIZE) ? ACTION_ID_SIZE : actIdLen;
String actId(action->id, action->id + actIdLen);
_configDomain->setVal(prefix + actId, input->id);
_configDomain->setVal(prefix + action->id, input->id);
}
}