X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=keymapparser.py;h=7131276f44a75d7626feac690157d5e3a0ef5ae2;hp=5c93092d347b105ce84a46150c50d7cd881bc0dc;hb=e74488aadbdfd34aea53166c9447016f3fa3ac29;hpb=0e61797c03c26a8b004dff187a4e26fc6afb26e2

diff --git a/keymapparser.py b/keymapparser.py
index 5c93092..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
 
@@ -64,11 +63,11 @@ def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
 				p.bindKey(filename, device, keyid, flags, context, mapto)
 				addKeyBinding(filename, keyid, context, mapto, flags)
 
-		parseKeys("generic", cmap)
-
 		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)