X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FLibCecTray%2Fui%2FCECTray.cs;h=0b8d17c5636e0d81aa4fd9cffbfb53dfe21ce13c;hb=refs%2Ftags%2Fdebian%2F2.2.0-4_trusty;hp=3f7c09422aa0a86e9aa21ab2da6714c135ccdf44;hpb=8fad0fe870edcd90e4788d8b56da80ab29c9e016;p=deb_libcec.git

diff --git a/src/LibCecTray/ui/CECTray.cs b/src/LibCecTray/ui/CECTray.cs
index 3f7c094..0b8d17c 100644
--- a/src/LibCecTray/ui/CECTray.cs
+++ b/src/LibCecTray/ui/CECTray.cs
@@ -59,6 +59,8 @@ namespace LibCECTray.ui
       _sstimer.Tick += ScreensaverActiveCheck;
       _sstimer.Enabled = false;
 
+      _lastScreensaverActivated = DateTime.Now;
+
       VisibleChanged += delegate
                        {
                          if (!Visible)
@@ -114,8 +116,14 @@ namespace LibCECTray.ui
         // there's no event for screensaver exit
         if (!_sstimer.Enabled)
         {
-          _sstimer.Enabled = true;
-          Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
+          // guard against screensaver failing, and resulting in power up and down spam to the tv
+          TimeSpan diff = DateTime.Now - _lastScreensaverActivated;
+          if (diff.TotalSeconds > 60)
+          {
+            _sstimer.Enabled = true;
+            _lastScreensaverActivated = DateTime.Now;
+            Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
+          }
         }
       }
       else if (msg.Msg == WM_POWERBROADCAST)
@@ -144,7 +152,7 @@ namespace LibCECTray.ui
                     //OnWake();
                     //return;
                   case 1:
-                    OnSleep();
+                    Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
                     return;
                   default:
                     break;
@@ -616,6 +624,7 @@ namespace LibCECTray.ui
     }
 
     private System.Windows.Forms.Timer _sstimer = new System.Windows.Forms.Timer();
+    private DateTime _lastScreensaverActivated;
     #endregion
 
     private void AddNewApplicationToolStripMenuItemClick(object sender, EventArgs e)