Another bug fix for suspend/resume on iPAQs (blinking screen).. this bug

is very hard to trigger and has probably never shown up

1 files changed, 2 insertions, 0 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 1e741d5..3ee5e26 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -176,128 +176,130 @@ void initEnvironment()
 }
 
 static void initBacklight()
 {
     QCopEnvelope e("QPE/System", "setBacklight(int)" );
     e << -3; // Forced on
 }
 
 
 class ModelKeyFilter : public QObject, public QWSServer::KeyboardFilter
 {
 public:
         ModelKeyFilter ( ) : QObject ( 0, "MODEL_KEY_FILTER" )
         {
                 bool doinst = false;
         
                 m_model = ODevice::inst ( )-> model ( );
                 m_power_timer = 0;
                 
                 switch ( m_model ) {
                         case OMODEL_iPAQ_H31xx:
                         case OMODEL_iPAQ_H36xx: 
                         case OMODEL_iPAQ_H37xx: 
                         case OMODEL_iPAQ_H38xx: doinst = true; 
                                                 break;
                         default               : break;
                 }
                 if ( doinst )
                         QWSServer::setKeyboardFilter ( this );
         }
 
         virtual bool filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
         {
                 bool kill = false;
         
                 // Rotate cursor keys 180°
                 switch ( m_model ) {
                         case OMODEL_iPAQ_H31xx:
                         case OMODEL_iPAQ_H38xx: {
                                 int newkeycode = keycode;
                         
                                 switch ( keycode ) {
                                         case Key_Left : newkeycode = Key_Right; break;
                                         case Key_Right: newkeycode = Key_Left; break;
                                         case Key_Up   : newkeycode = Key_Down; break;
                                         case Key_Down : newkeycode = Key_Up; break;
                                 }
                                 if ( newkeycode != keycode ) {
                                         QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
                                         kill = true;
                                 }
                                 break;
                         }
                         default: break;
                         }
                 
                 // map Power Button short/long press to F34/F35
                 switch ( m_model ) {
                         case OMODEL_iPAQ_H31xx:
                         case OMODEL_iPAQ_H36xx: 
                         case OMODEL_iPAQ_H37xx: 
                         case OMODEL_iPAQ_H38xx: {
                                 if ( keycode == Key_SysReq ) {
                                         if ( isPress ) {
+                                                if ( m_power_timer )
+                                                        killTimer ( m_power_timer );
                                                 m_power_timer = startTimer ( 500 );
                                         }
                                         else if ( m_power_timer ) {
                                                 killTimer ( m_power_timer );
                                                 m_power_timer = 0;
                                                 QWSServer::sendKeyEvent ( -1, Key_F34, 0, true, false );
                                                 QWSServer::sendKeyEvent ( -1, Key_F34, 0, false, false );
                                         }
                                                 kill = true;            
                                 }
                                 break;
                         }
                         default: break;
                         }                       
                 return kill;
         }
 
         virtual void timerEvent ( QTimerEvent * )
         {
                 killTimer ( m_power_timer );
                 m_power_timer = 0;
                 QWSServer::sendKeyEvent ( -1, Key_F35, 0, true, false );
                 QWSServer::sendKeyEvent ( -1, Key_F35, 0, false, false );
         }
 
 private:
         OModel  m_model;
         int     m_power_timer;
 };
 
 
 
 int initApplication( int argc, char ** argv )
 {
 #ifdef QT_QWS_CASSIOPEIA
     initCassiopeia();
 #endif
 
 #ifdef QPE_OWNAPM
     initAPM();
 #endif
 
 #ifdef QT_DEMO_SINGLE_FLOPPY
     initFloppy();
 #endif
 
     initEnvironment();
 
 #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX)
     setenv( "QWS_SIZE", "240x320", 0 );
 #endif
 
     //Don't flicker at startup:
     QWSServer::setDesktopBackground( QImage() );
     DesktopApplication a( argc, argv, QApplication::GuiServer );
 
         (void) new ModelKeyFilter ( );
 
     initBacklight();
 
     AlarmServer::initialize();
 
     Desktop *d = new Desktop();