updated for version 7.4.461
Problem: MS-Windows: When collate is on the number of copies is too high.
Solution: Only set the collated/uncollated count when collate is on.
(Yasuhiro Matsumoto)
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 8ad3695..9151aef 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1673,16 +1673,22 @@
*/
psettings->chars_per_line = prt_get_cpl();
psettings->lines_per_page = prt_get_lpp();
- psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
- ? prt_dlg.nCopies : 1;
- psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
- ? 1 : prt_dlg.nCopies;
+ if (prt_dlg.Flags & PD_USEDEVMODECOPIESANDCOLLATE)
+ {
+ psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
+ ? prt_dlg.nCopies : 1;
+ psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
+ ? 1 : prt_dlg.nCopies;
- if (psettings->n_collated_copies == 0)
+ if (psettings->n_collated_copies == 0)
+ psettings->n_collated_copies = 1;
+
+ if (psettings->n_uncollated_copies == 0)
+ psettings->n_uncollated_copies = 1;
+ } else {
psettings->n_collated_copies = 1;
-
- if (psettings->n_uncollated_copies == 0)
psettings->n_uncollated_copies = 1;
+ }
psettings->jobname = jobname;
diff --git a/src/version.c b/src/version.c
index 4c5324a..d0847ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 461,
+/**/
460,
/**/
459,
