X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftimers.c;h=d810b4924d32e934de1d62ddc3e0c271ef8c8be2;hp=1dbdeff6706481a32ba9a99697a26cf44284bf06;hb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;hpb=de041722414a2e31c1c04caa10aaec9d6952e9b4

diff --git a/driver/timers.c b/driver/timers.c
index 1dbdeff6..d810b492 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -1071,9 +1071,18 @@ static void
 watchdog_timer (XtPointer closure, XtIntervalId *id)
 {
   saver_info *si = (saver_info *) closure;
+  saver_preferences *p = &si->prefs;
 
   disable_builtin_screensaver (si, False);
 
+  /* If the DPMS settings on the server have changed, change them back to
+     what ~/.xscreensaver says they should be. */
+  sync_server_dpms_settings (si->dpy, p->dpms_enabled_p,
+                             p->dpms_standby / 1000,
+                             p->dpms_suspend / 1000,
+                             p->dpms_off / 1000,
+                             False);
+
   if (si->screen_blanked_p)
     {
       Bool running_p = screenhack_running_p (si);