Merge changes from CUPS 1.5svn-r9567

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

diff --git a/scheduler/job.c b/scheduler/job.c
index 3d7eba1b30954a9c94475f56599d0f63619eadd3..efacdd318b2c9231f289f9bca8636228ac3ecc65 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -904,9 +904,13 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */
 
     if (filter && filter->dst)
     {
-      snprintf(final_content_type, sizeof(final_content_type),
-              "FINAL_CONTENT_TYPE=%s/%s",
-              filter->dst->super, filter->dst->type);
+      if (strchr(filter->dst->type, '/'))
+       snprintf(final_content_type, sizeof(final_content_type),
+                "FINAL_CONTENT_TYPE=%s", filter->dst->type);
+      else
+       snprintf(final_content_type, sizeof(final_content_type),
+                "FINAL_CONTENT_TYPE=%s/%s", filter->dst->super,
+                filter->dst->type);
       envp[envc ++] = final_content_type;
     }
   }