1 files changed, 7 insertions, 4 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index fbcce7c..86527f6 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -347,16 +347,19 @@ bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keyc
 	if ( db ) {
 		if ( !press && !autoRepeat && m_button_timer-> isActive ( )) {
 			m_button_timer-> stop ( );
 			
 			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
 			{
+
 				if ( db-> pressedAction ( ). channel ( )!="ignore") {
+
 					db-> pressedAction ( ). send ( );
 				}
-				else return false;
+				else 
+				   return false;
 			}
 		}
 		else if ( press && !autoRepeat ) {
 			m_button_timer-> stop ( );
 			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
 			{
@@ -371,19 +374,21 @@ bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keyc
 	}
 	return true;
 }
 
 bool DesktopApplication::eventFilter ( QObject *o, QEvent *e )
 {
+
 	if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) {
 		QKeyEvent *ke = (QKeyEvent *) e;
 	
 		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( ));
         
 		if ( db ) {
-			return checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ));
+			if (checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( )))
+				return true;		//checkButtonAction retrune false if events should be routed through
 		}
 	}
 	return QPEApplication::eventFilter ( o, e );
 }
 
 #ifdef Q_WS_QWS
@@ -662,14 +667,12 @@ void Desktop::execAutoStart()
 
 
 void Desktop::togglePower()
 {
 	static bool excllock = false;
 
-	qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 );
-
 	if ( excllock )
 		return ;
 
 	excllock = true;
 
 	bool wasloggedin = loggedin;