X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.c;h=5ce1a90917104e3f2dd014989e7c5b9df4655f5e;hb=13dbc569cdc6e29019722c0ef9b932a925efbcad;hp=0e60dfcc8599da4afdf6b01ab7c8e2eea4004eff;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28;p=xscreensaver

diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
index 0e60dfcc..5ce1a909 100644
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -289,6 +289,7 @@ saver_ehandler (Display *dpy, XErrorEvent *error)
 {
   saver_info *si = global_si_kludge;	/* I hate C so much... */
   int i;
+  Bool fatal_p;
 
   if (!real_stderr) real_stderr = stderr;
 
@@ -309,9 +310,19 @@ saver_ehandler (Display *dpy, XErrorEvent *error)
 	   "#######################################"
 	   "#######################################\n\n");
 
-  if (XmuPrintDefaultErrorMessage (dpy, error, real_stderr))
+  fatal_p = XmuPrintDefaultErrorMessage (dpy, error, real_stderr);
+
+  fatal_p = True;  /* The only time I've ever seen a supposedly nonfatal error,
+                      it has been BadImplementation / Xlib sequence lost, which
+                      are in truth pretty damned fatal.
+                    */
+
+  fprintf (real_stderr, "\n");
+
+  if (! fatal_p)
+    fprintf (real_stderr, "%s: nonfatal error.\n\n", blurb());
+  else
     {
-      fprintf (real_stderr, "\n");
       if (si->prefs.xsync_p)
 	{
 	  saver_exit (si, -1, "because of synchronous X Error");
@@ -342,8 +353,7 @@ saver_ehandler (Display *dpy, XErrorEvent *error)
 	  saver_exit (si, -1, 0);
 	}
     }
-  else
-    fprintf (real_stderr, " (nonfatal.)\n");
+
   return 0;
 }