X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftimers.c;h=1dbdeff6706481a32ba9a99697a26cf44284bf06;hp=61a0155d097f26d2d73d1224d877ae2d1acc9e4b;hb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;hpb=14463b6ad1ab1ccf81f9c33350b048e410ba94cb

diff --git a/driver/timers.c b/driver/timers.c
index 61a0155d..1dbdeff6 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -230,8 +230,6 @@ cycle_timer (XtPointer closure, XtIntervalId *id)
   else
     {
       maybe_reload_init_file (si);
-      if (p->verbose_p)
-	fprintf (stderr, "%s: changing graphics hacks.\n", blurb());
       kill_screenhack (si);
 
       if (!si->throttled_p)
@@ -1099,11 +1097,12 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
           raise_window (si, True, True, running_p);
         }
 
-      if (!monitor_powered_on_p (si))
+      if (screenhack_running_p (si) &&
+          !monitor_powered_on_p (si))
 	{
 	  if (si->prefs.verbose_p)
 	    fprintf (stderr,
-		     "%s: server reports that monitor has powered down; "
+		     "%s: X says monitor has powered down; "
 		     "killing running hacks.\n", blurb());
 	  kill_screenhack (si);
 	}