projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.x.org/contrib/applications/xscreensaver-3.23.tar.gz
[xscreensaver]
/
driver
/
timers.c
diff --git
a/driver/timers.c
b/driver/timers.c
index 61a0155d097f26d2d73d1224d877ae2d1acc9e4b..1dbdeff6706481a32ba9a99697a26cf44284bf06 100644
(file)
--- a/
driver/timers.c
+++ b/
driver/timers.c
@@
-230,8
+230,6
@@
cycle_timer (XtPointer closure, XtIntervalId *id)
else
{
maybe_reload_init_file (si);
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)
kill_screenhack (si);
if (!si->throttled_p)
@@
-1099,11
+1097,12
@@
watchdog_timer (XtPointer closure, XtIntervalId *id)
raise_window (si, True, True, running_p);
}
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,
{
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);
}
"killing running hacks.\n", blurb());
kill_screenhack (si);
}