aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kennedy2008-08-14 01:48:19 +0000
committerStephen Kennedy2008-08-14 01:48:19 +0000
commitd40e7a6640a3e58e62f75dc9c05e41fbaaa26bd4 (patch)
tree53ae7265aa72b6181660128f840d7ef33ce8b9a8
parentc1e8e340ff889c675e5c8e980a06a1174b1ec34d (diff)
downloadscummvm-rg350-d40e7a6640a3e58e62f75dc9c05e41fbaaa26bd4.tar.gz
scummvm-rg350-d40e7a6640a3e58e62f75dc9c05e41fbaaa26bd4.tar.bz2
scummvm-rg350-d40e7a6640a3e58e62f75dc9c05e41fbaaa26bd4.zip
Fix for regression
svn-id: r33854
-rw-r--r--backends/keymapper/keymap-manager.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/backends/keymapper/keymap-manager.cpp b/backends/keymapper/keymap-manager.cpp
index 1b6b547858..f57c0e5504 100644
--- a/backends/keymapper/keymap-manager.cpp
+++ b/backends/keymapper/keymap-manager.cpp
@@ -73,7 +73,6 @@ void KeymapManager::registerGlobalKeymap(Keymap *map) {
void KeymapManager::refreshGameDomain() {
if (_gameDomain.getConfigDomain() != ConfMan.getActiveDomain()) {
_gameDomain.deleteAllKeyMaps();
-
_gameDomain.setConfigDomain(ConfMan.getActiveDomain());
}
}
@@ -88,11 +87,8 @@ void KeymapManager::initKeymap(ConfigManager::Domain *domain,
Keymap *map) {
map->setConfigDomain(domain);
map->loadMappings(_hardwareKeys);
- if (map->isComplete(_hardwareKeys) == false) {
+ if (map->isComplete(_hardwareKeys) == false)
automaticMap(map);
- map->saveMappings(domain);
- ConfMan.flushToDisk();
- }
}
// TODO: