diff options
| author | Tarek Soliman | 2012-02-24 13:55:48 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-03-02 20:48:50 -0600 |
| commit | 4ee1a3aceae7d68c89513f7d122606acbceb1e7c (patch) | |
| tree | 0f9d3153b7f2f721f0d23e7bfce9e5fe8e287421 /backends/keymapper/remap-dialog.cpp | |
| parent | 101ec2b885aade21216c1bba8488711b30d192eb (diff) | |
| download | scummvm-rg350-4ee1a3aceae7d68c89513f7d122606acbceb1e7c.tar.gz scummvm-rg350-4ee1a3aceae7d68c89513f7d122606acbceb1e7c.tar.bz2 scummvm-rg350-4ee1a3aceae7d68c89513f7d122606acbceb1e7c.zip | |
KEYMAPPER: Add non-key inputs to HardwareInput
Diffstat (limited to 'backends/keymapper/remap-dialog.cpp')
| -rw-r--r-- | backends/keymapper/remap-dialog.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index dab295219a..29f0174aad 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -354,9 +354,13 @@ void RemapDialog::loadKeymap() { Keymapper::MapRecord mr = activeKeymaps[i]; debug(3, "RemapDialog::loadKeymap keymap: %s", mr.keymap->getName().c_str()); List<const HardwareInput *>::iterator inputIt = freeInputs.begin(); + const HardwareInput *input = *inputIt; while (inputIt != freeInputs.end()) { - Action *act = mr.keymap->getMappedAction((*inputIt)->key); + Action *act = 0; + // FIXME: Add support for kHardwareInputTypeGeneric + if (input->type == kHardwareInputTypeKeyboard) + act = mr.keymap->getMappedAction(input->key); if (act) { ActionInfo info = {act, true, act->description + " (" + mr.keymap->getName() + ")"}; |