diff options
| author | Eugene Sandulenko | 2009-05-10 18:04:47 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2009-05-10 18:04:47 +0000 |
| commit | c7e5cc2935a1a0c7eb2540ed78e52cf3ff3763b6 (patch) | |
| tree | a02d2feead0df30b2f073b000d247ea62471ca2b | |
| parent | 3a392ed05b68b560f744cd06d7eec962aff782a8 (diff) | |
| download | scummvm-rg350-c7e5cc2935a1a0c7eb2540ed78e52cf3ff3763b6.tar.gz scummvm-rg350-c7e5cc2935a1a0c7eb2540ed78e52cf3ff3763b6.tar.bz2 scummvm-rg350-c7e5cc2935a1a0c7eb2540ed78e52cf3ff3763b6.zip | |
Actually save keymap after remapping
svn-id: r40429
| -rw-r--r-- | backends/keymapper/action.h | 2 | ||||
| -rw-r--r-- | backends/keymapper/remap-dialog.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h index c5e306a4b8..04d8dd4067 100644 --- a/backends/keymapper/action.h +++ b/backends/keymapper/action.h @@ -101,7 +101,7 @@ public: addEvent(evt); } - Keymap *getBoss() { + Keymap *getParent() { return _boss; } diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 169d85a353..54ba8edd00 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -123,7 +123,7 @@ void RemapDialog::close() { free(_keymapTable); _keymapTable = 0; - if (_changes) + if (_changes) ConfMan.flushToDisk(); Dialog::close(); @@ -232,7 +232,7 @@ void RemapDialog::handleKeyUp(Common::KeyState state) { if (hwkey) { _activeRemapAction->mapKey(hwkey); - // TODO: _activeRemapAction->getParent()->saveMappings(); + _activeRemapAction->getParent()->saveMappings(); _changes = true; stopRemapping(); } |