Merge changes from CUPS 1.5svn-r9675.

[thirdparty/cups.git] / cups / conflicts.c

diff --git a/cups/conflicts.c b/cups/conflicts.c
index 56f800c1d3a63a68ae6e99578d60592e31851ce5..543b6aececcda2ce59353edb41c5c09d75ab5acf 100644 (file)
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -94,6 +94,7 @@ cupsGetConflicts(
   cups_array_t         *active;        /* Active conflicts */
   _ppd_cups_uiconsts_t *c;             /* Current constraints */
   _ppd_cups_uiconst_t  *cptr;          /* Current constraint */
+  ppd_choice_t         *marked;        /* Marked choice */
 
 
  /*
@@ -125,8 +126,16 @@ cupsGetConflicts(
          i > 0;
         i --, cptr ++)
       if (strcasecmp(cptr->option->keyword, option))
-        num_options = cupsAddOption(cptr->option->keyword, cptr->choice->choice,
-                                   num_options, options);
+      {
+        if (cptr->choice)
+         num_options = cupsAddOption(cptr->option->keyword,
+                                     cptr->choice->choice, num_options,
+                                     options);
+        else if ((marked = ppdFindMarkedChoice(ppd,
+                                              cptr->option->keyword)) != NULL)
+         num_options = cupsAddOption(cptr->option->keyword, marked->choice,
+                                     num_options, options);
+      }
   }
 
   cupsArrayDelete(active);