2 files changed, 6 insertions, 3 deletions

diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index 8967d77..ef6d713 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -1190,8 +1190,9 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
         }
-        if (mod )
+        if (mod ) {
             m_mod |= mod;
-        else
+            key = 0;
+        }else
             m_key = key;
 
-        if ( ( !mod || m_key ) && !m_timer->isActive() )
+        if ( ( !mod || m_key || key ) && !m_timer->isActive() )
             m_timer->start( 150, true );
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 0749f7d..e97e82c 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -7,2 +7,3 @@ HEADERS     = oclickablelabel.h      \
               oimageeffect.h         \
+              okeyconfigwidget.h     \
               olistview.h            \
@@ -27,2 +28,3 @@ SOURCES     = oclickablelabel.cpp    \
               oimageeffect.cpp       \
+              okeyconfigwidget.cpp   \
               olistview.cpp          \