Merge changes from CUPS 1.7svn-r10791.

[thirdparty/cups.git] / cups / dest-options.c

diff --git a/cups/dest-options.c b/cups/dest-options.c
index d8eff72e5b568888b7783074df34f153d25700df..8477ab30ab8849d1d7f597979629c2a7d1baf4c4 100644 (file)
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -485,7 +485,7 @@ cupsCopyDestConflicts(
     active = NULL;
   }
 
-  if (tries >= 0)
+  if (tries >= 100)
   {
     DEBUG_puts("1cupsCopyDestConflicts: Unable to resolve after 100 tries.");
     have_conflicts = -1;