Merge changes from CUPS 1.6svn-r9939.

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

diff --git a/cups/mark.c b/cups/mark.c
index 113220071e9157a6f55a9023745a13b554041edc..44fc54d6853e8b899688218e32b16b6e9ff714f0 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -257,11 +257,13 @@ cupsMarkOptions(
       * Map sides to duplex option...
       */
 
-      if (!strcmp(sides, "one-sided"))
+      if (!strcmp(sides, "one-sided") && cache->sides_1sided)
         ppd_mark_option(ppd, cache->sides_option, cache->sides_1sided);
-      else if (!strcmp(sides, "two-sided-long-edge"))
+      else if (!strcmp(sides, "two-sided-long-edge") &&
+               cache->sides_2sided_long)
         ppd_mark_option(ppd, cache->sides_option, cache->sides_2sided_long);
-      else if (!strcmp(sides, "two-sided-short-edge"))
+      else if (!strcmp(sides, "two-sided-short-edge") &&
+               cache->sides_2sided_short)
         ppd_mark_option(ppd, cache->sides_option, cache->sides_2sided_short);
     }
   }