1 files changed, 9 insertions, 3 deletions

diff --git a/libopie2/opiecore/okeyconfigmanager.cpp b/libopie2/opiecore/okeyconfigmanager.cpp
index 18740ef..ad0f7f7 100644
--- a/libopie2/opiecore/okeyconfigmanager.cpp
+++ b/libopie2/opiecore/okeyconfigmanager.cpp
@@ -495,2 +495,3 @@ OKeyConfigManager::~OKeyConfigManager() {
         QPEApplication::ungrabKeyboard();
+    delete m_map;
 }
@@ -513,4 +514,6 @@ void OKeyConfigManager::load() {
     for( OKeyConfigItem::List::Iterator it = m_keys.begin(); it != m_keys.end(); ++it ) {
-        key = m_conf->readNumEntry( (*it).configKey()+"key", (*it).defaultKeyPair().keycode()  );
-        mod = m_conf->readNumEntry( (*it).configKey()+"mod", (*it).defaultKeyPair().modifier() );
+        key = m_conf->readNumEntry( (*it).configKey()+"key",
+                                    (*it).defaultKeyPair().keycode()  );
+        mod = m_conf->readNumEntry( (*it).configKey()+"mod",
+                                    (*it).defaultKeyPair().modifier() );
         OKeyPair okey( key, mod );
@@ -518,3 +521,3 @@ void OKeyConfigManager::load() {
         if (  !m_blackKeys.contains( okey ) && key != -1  && mod != -1 )
-            (*it).setKeyPair( OKeyPair(key, mod) );
+            (*it).setKeyPair( okey );
         else
@@ -687,2 +690,5 @@ bool OKeyConfigManager::eventFilter( QObject* obj, QEvent* ev) {
 
+    /*
+     * check  if we care for the event
+     */
     if ( (ev->type() != QEvent::KeyPress||!testEventMask(MaskPressed)) &&