[Scummvm-cvs-logs] scummvm master -> 9de279b2ab1eb75ca937d63fe337078d1d44cf3d

[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:
9de279b2ab KEYMAPPER: Fix active keymap name displayed in remap dialog


Commit: 9de279b2ab1eb75ca937d63fe337078d1d44cf3d
    https://github.com/scummvm/scummvm/commit/9de279b2ab1eb75ca937d63fe337078d1d44cf3d
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-05T17:01:51-08:00

Commit Message:
KEYMAPPER: Fix active keymap name displayed in remap dialog

This workaround no longer applies and is in fact causing a bug
in the name of active keymap

Changed paths:
    backends/keymapper/remap-dialog.cpp



diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 445ed67..8f18777 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -307,10 +307,6 @@ void RemapDialog::loadKeymap() {
 		List<const HardwareKey*> freeKeys(_keymapper->getHardwareKeys());
 
 		int topIndex = activeKeymaps.size() - 1;
-		// skip the top gui keymap since it is for the keymapper itself
-		// TODO: Don't use the keymap name as a way to discriminate GUI maps
-		if (topIndex > 0 && activeKeymaps[topIndex].keymap->getName().equals(kGuiKeymapName))
-			--topIndex;
 
 		// add most active keymap's keys
 		Keymapper::MapRecord top = activeKeymaps[topIndex];