[Scummvm-cvs-logs] SF.net SVN: scummvm:[35972] scummvm/trunk/backends/keymapper/keymapper.cpp

[fingolfin at users.sourceforge.net]

Revision: 35972
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35972&view=rev
Author:   fingolfin
Date:     2009-01-21 02:07:23 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Fix what I believe to be an error in Keymapper::cleanupGameKeymaps

Modified Paths:
--------------
    scummvm/trunk/backends/keymapper/keymapper.cpp

Modified: scummvm/trunk/backends/keymapper/keymapper.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/keymapper.cpp	2009-01-21 02:02:55 UTC (rev 35971)
+++ scummvm/trunk/backends/keymapper/keymapper.cpp	2009-01-21 02:07:23 UTC (rev 35972)
@@ -96,10 +96,14 @@
 }
 
 void Keymapper::cleanupGameKeymaps() {
+	// Flush all game specific keymaps
 	_gameDomain.deleteAllKeyMaps();
+	
+	// Now restore the stack of active maps. Re-add all global keymaps, drop
+	// the game specific (=deleted) ones.
 	Stack<MapRecord> newStack;
 	for (int i = 0; i < _activeMaps.size(); i++) {
-		if (!_activeMaps[i].global)
+		if (_activeMaps[i].global)
 			newStack.push(_activeMaps[i]);
 	}
 	_activeMaps = newStack;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.