- use sane default values for screensaver timeouts

- fixed the "Battery low warning" when plugging the device into AC

1 files changed, 3 insertions, 3 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index bc43475..f2e00d8 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -222,15 +222,15 @@ void DesktopApplication::apmTimeout()
 	if ( m_ps-> acStatus ( ) != m_ps_last-> acStatus ( ))
 		m_screensaver-> powerStatusChanged ( *m_ps );
 
+	if ( m_ps-> acStatus ( ) != PowerStatus::Online ) {
 	int bat = m_ps-> batteryPercentRemaining ( );
 
-	if ( m_ps_last-> batteryPercentRemaining ( ) != bat ) {
+		if ( bat < m_ps_last-> batteryPercentRemaining ( )) {
 		if ( bat <= m_powerCritical ) 
 			pa->alert( tr( "Battery level is critical!\nKeep power off until power restored!" ), 1 );
 		else if ( bat <= m_powerVeryLow )
 			pa->alert( tr( "Battery is running very low." ), 2 );
-
-
+		}	
 		if ( m_ps-> backupBatteryStatus ( ) == PowerStatus::VeryLow ) 
 			pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 2 );
   	}