Merge changes from CUPS 1.4svn-r7715.

[thirdparty/cups.git] / scheduler / log.c

diff --git a/scheduler/log.c b/scheduler/log.c
index fde21215e59f1e527e1e5f23a44fa12d2883a2fb..ea6d7755db552e9ca3d457731ba788edb18909ba 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: log.c 7697 2008-06-27 15:56:00Z mike $"
+ * "$Id: log.c 7699 2008-06-27 20:44:23Z mike $"
  *
  *   Log file routines for the Common UNIX Printing System (CUPS).
  *
@@ -190,9 +190,6 @@ cupsdLogJob(cupsd_job_t *job,               /* I - Job */
   if (TestConfigFile || level > LogLevel || !ErrorLog)
     return (1);
 
-  if (level > LogLevel || !ErrorLog)
-    return (1);
-
  /*
   * Format and write the log message...
   */
@@ -829,5 +826,5 @@ format_log_line(const char *message,        /* I - Printf-style format string */
 
 
 /*
- * End of "$Id: log.c 7697 2008-06-27 15:56:00Z mike $".
+ * End of "$Id: log.c 7699 2008-06-27 20:44:23Z mike $".
  */