X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Ftimers.c;h=89026d1bd6d5b168bba4004cf1966c243e1e1fc2;hb=0bd2eabab3e404c6769fe8f59b639275e960c415;hp=dcff2e4e42116e22633f57ea9e6d22a68c0a69e3;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver

diff --git a/driver/timers.c b/driver/timers.c
index dcff2e4e..89026d1b 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -181,10 +181,10 @@ cycle_timer (XtPointer closure, XtIntervalId *id)
   saver_info *si = (saver_info *) closure;
   saver_preferences *p = &si->prefs;
   Time how_long = p->cycle;
-  if (si->dbox_up_p)
+  if (si->dbox_up_p || si->question_up_p)
     {
       if (p->verbose_p)
-	printf ("%s: dbox up; delaying hack change.\n", progname);
+	printf ("%s: dialog box up; delaying hack change.\n", progname);
       how_long = 30000; /* 30 secs */
     }
   else
@@ -608,6 +608,14 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
 #endif /* DEBUG_TIMERS */
 
 	  raise_window (si, True, True, running_p);
+
+	  if (!monitor_powered_on_p (si))
+	    {
+	      if (si->prefs.verbose_p)
+		printf ("%s: server reports that monitor has powered down; "
+			"killing running hacks.\n", progname);
+	      kill_screenhack (si);
+	    }
 	}
     }
 }