[Scummvm-cvs-logs] scummvm master -> 784ee5dd655c3e0dfa7007e3cb746c3bc5cd7f29

[tsoliman]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
784ee5dd65 KEYMAPPER: Fix mistake in last commit


Commit: 784ee5dd655c3e0dfa7007e3cb746c3bc5cd7f29
    https://github.com/scummvm/scummvm/commit/784ee5dd655c3e0dfa7007e3cb746c3bc5cd7f29
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-22T15:23:12-08:00

Commit Message:
KEYMAPPER: Fix mistake in last commit

Changed paths:
    base/main.cpp



diff --git a/base/main.cpp b/base/main.cpp
index f8d04fa..5e9f1d4 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -264,7 +264,7 @@ static void setupKeymapper(OSystem &system) {
 
 	Keymapper *mapper = system.getEventManager()->getKeymapper();
 
-	HardwareInputSet *inputSet = system.getHardwareInputSet();
+	HardwareKeySet *keySet = system.getHardwareKeySet();
 
 	// Query backend for hardware keys and register them
 	mapper->registerHardwareKeySet(keySet);