2 files changed, 18 insertions, 6 deletions

diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 75d4ac1..6fe0479 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -143,9 +143,9 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 }
 
 //---------------------------------------------------------------------------
 
-KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0)
+KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0),firedHeldButton(0)
 {
     /* We don't do this cause it would interfere with ODevice */
 #if 0
     qwsServer->setKeyboardFilter(this);
@@ -158,8 +158,9 @@ void KeyFilter::timerEvent(QTimerEvent* e)
     killTimer(held_tid);
     // button held
     if ( heldButton ) {
         emit activate(heldButton, TRUE);
+        firedHeldButton = heldButton;
         heldButton = 0;
     }
     held_tid = 0;
     }
@@ -201,27 +202,38 @@ bool KeyFilter::checkButtonAction(bool db, int keycode,  int press, int autoRepe
         && keycode != Key_Up
         && keycode != Key_Down )
     return TRUE;
 
+//    odebug << " KeyFilter::checkButtonAction("<<db<<","<<keycode<<","<<press<<","<<autoRepeat<<")"<<oendl;
         /* check if it was registered */
     if (!db ) {
         if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) )
             return true;
     } else {
-
         // First check to see if DeviceButtonManager knows something about this button:
         const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode);
         if (button && !autoRepeat) {
-            if ( held_tid ) {
+            if (firedHeldButton) {
+                if (held_tid) {
+                    killTimer(held_tid);
+                    held_tid = 0;
+                }
+                if (!press && button == firedHeldButton) {
+                    firedHeldButton = 0;
+                    return TRUE;
+                }
+            } else if ( held_tid && heldButton != button) {
                 killTimer(held_tid);
                 held_tid = 0;
             }
             if ( button->heldAction().isNull() ) {
                 if ( press )
                     emit activate(button, FALSE);
             } else if ( press ) {
-                heldButton = button;
-                held_tid = startTimer( ODevice::inst ()->buttonHoldTime () );
+                if (heldButton != button) {
+                   heldButton = button;
+                   held_tid = startTimer( ODevice::inst ()->buttonHoldTime () );
+                }
             } else if ( heldButton ) {
                 heldButton = 0;
                 emit activate(button, FALSE);
             }
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h
index 27be28b..98c5633 100644
--- a/core/launcher/serverapp.h
+++ b/core/launcher/serverapp.h
@@ -80,9 +80,9 @@ signals:
 
 private:
     bool keyRegistered( int key );
     int held_tid;
-    const Opie::Core::ODeviceButton* heldButton;
+    const Opie::Core::ODeviceButton* heldButton,*firedHeldButton;
     KeyRegisterList m_keys;
 };
 
 class ServerApplication : public Opie::Core::OApplication