X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=keymapparser.py;h=7131276f44a75d7626feac690157d5e3a0ef5ae2;hb=5d6e862f8d4aa80b0907f520237ac28aa1247829;hp=21e99818f10e786644dedf9d89fcad3896d0c128;hpb=40ba45345d3300c20f82fc8ddaf23b8913836806;p=vuplus_dvbapp

diff --git a/keymapparser.py b/keymapparser.py
index 21e9981..7131276 100644
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -7,8 +7,7 @@ from keyids import KEYIDS;
 # these are only informational (for help)...
 from Tools.KeyBindings import addKeyBinding
 
-def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
-
+def readKeymap(filename):
 	p = enigma.eActionMap.getInstance()
 	assert p
 
@@ -62,13 +61,13 @@ def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
 
 #				print context + "::" + mapto + " -> " + device + "." + hex(keyid)
 				p.bindKey(filename, device, keyid, flags, context, mapto)
-				addKeyBinding(filename, keyid, context, mapto)
-
-		parseKeys("generic", cmap)
+				addKeyBinding(filename, keyid, context, mapto, flags)
 
 		for device in elementsWithTag(cmap.childNodes, "device"):
 			parseKeys(str(device.getAttribute("name")), device)
 
+		parseKeys("generic", cmap)
+
 def removeKeymap(filename):
 	p = enigma.eActionMap.getInstance()
 	p.unbindKeyDomain(filename)