X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fprefs.c;h=cdf957961696a919868ac0184582054114d1e430;hp=e191314292ad6aaa599d17099f4082b74b8992f5;hb=278c59e14c53fd412b734e699bd4f314f766f804;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9 diff --git a/driver/prefs.c b/driver/prefs.c index e1913142..cdf95796 100644 --- a/driver/prefs.c +++ b/driver/prefs.c @@ -808,15 +808,7 @@ load_init_file (saver_preferences *p) p->fade_p = False; if (! p->fade_p) p->unfade_p = False; - if (p->verbose_p && !p->fading_possible_p && (p->fade_p || p->unfade_p)) - { - fprintf (stderr, "%s: there are no PseudoColor or GrayScale visuals.\n", - blurb()); - fprintf (stderr, "%s: ignoring the request for fading/unfading.\n", - blurb()); - } - - p->watchdog_timeout = p->cycle; + p->watchdog_timeout = p->cycle * 0.6; if (p->watchdog_timeout < 30000) p->watchdog_timeout = 30000; /* 30 secs */ if (p->watchdog_timeout > 3600000) p->watchdog_timeout = 3600000; /* 1 hr */