src/screensaverengine.cpp
branchRCL_3
changeset 12 0bfd55b8504e
parent 11 4784a3bc2236
child 14 d8eca2b0590d
equal deleted inserted replaced
11:4784a3bc2236 12:0bfd55b8504e
   810         if ( !iScreenSaverIsOn )
   810         if ( !iScreenSaverIsOn )
   811             {
   811             {
   812             // Start the screensaver, but set the ignore flag in case keylock
   812             // Start the screensaver, but set the ignore flag in case keylock
   813             // was activated using the side switch. The switch will generate
   813             // was activated using the side switch. The switch will generate
   814             // activity that must be ignored.
   814             // activity that must be ignored.
   815             StartScreenSaver();
   815             if ( iActivityManagerScreensaverShort->IsMonitoringForActivity() )
       
   816                 {
       
   817                 // Inactive state, start immediately
       
   818                 StartScreenSaver();
       
   819                 }
       
   820             else
       
   821                 {
       
   822                 // Active state, go to inactive and start.
       
   823                 iActivityManagerScreensaverShort->SetInactivityTimeout(0);
       
   824                 }
       
   825             
   816             iIgnoreNextActivity = ETrue;
   826             iIgnoreNextActivity = ETrue;
   817             
   827             
   818             iIgnoreActivityResetTimer = CPeriodic::New( EPriorityLow );
   828             iIgnoreActivityResetTimer = CPeriodic::New( EPriorityLow );
   819             if ( iIgnoreActivityResetTimer )
   829             if ( iIgnoreActivityResetTimer )
   820                 {
   830                 {