]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
One more spot that needs to check for a printer-side cancel.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Fri, 5 Aug 2011 07:39:30 +0000 (07:39 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Fri, 5 Aug 2011 07:39:30 +0000 (07:39 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9864 7a7537e8-13f0-0310-91df-b6672ffda945

backend/ipp.c

index 0ce8beda40e90b5aa208b8ceafa4ba46e065cc63..9c505a10009acb435b801c17f319eba8ba557d14 100644 (file)
@@ -1770,7 +1770,7 @@ main(int  argc,                           /* I - Number of command-line args */
   else if (ipp_status == IPP_DOCUMENT_FORMAT ||
            ipp_status == IPP_CONFLICT)
     return (CUPS_BACKEND_FAILED);
-  else if (ipp_status > IPP_OK_CONFLICT)
+  else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED)
     return (CUPS_BACKEND_RETRY_CURRENT);
   else
   {