--- infoscreen/screenmanager.cpp	2009/12/15 13:53:02	512
+++ infoscreen/screenmanager.cpp	2010/01/07 11:32:42	530
@@ -8,6 +8,10 @@
 {
     QTime now = QTime::currentTime();
     screenEnabled = (now >=screenOnTime && now < screenOffTime);
+
+    if (screenEnabled) { //force screen enabled, on upstart
+        enableScreen();
+    }
 }
 
 
@@ -29,16 +33,22 @@
 //private
 void ScreenManager::disableScreen()
 {
+    int res;
     screenEnabled = false;
-    system("xset dpms force off");
+    res = system("xset dpms force off");
     qDebug("disableScreen");
 }
 
 
 void ScreenManager::enableScreen()
 {
+    int res;
     screenEnabled = true;
-    system("xset dpms force on");
-    system("xset -dpms"); //disable energy star auto turn -off
+    res = system("xset dpms force on");
+    res = system("xset -dpms"); //disable energy star auto turn -off
+
+    res = system("xset s reset");//disable screensaver
+    res = system("xset s off");
+
     qDebug("enableScreen");
 }