summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2017-12-07 14:07:26 -0500
committerSolomon Peachy <pizza@shaftnet.org>2017-12-07 14:09:26 -0500
commit1710b14b10e145ad7eb6256834fd04b631685e9d (patch)
treea231164dfeb2f6a1f26e57853ce523e122d2fe74
parentacac3f78b47b0e4a384ea36ee27b02233edcffa0 (diff)
downloadselphy_print-1710b14b10e145ad7eb6256834fd04b631685e9d.tar.gz
selphy_print-1710b14b10e145ad7eb6256834fd04b631685e9d.tar.bz2
selphy_print-1710b14b10e145ad7eb6256834fd04b631685e9d.zip
multiple: Fast return should not be used when backend generates copies
-rw-r--r--backend_canonselphyneo.c4
-rw-r--r--backend_dnpds40.c4
-rw-r--r--backend_mitsu70x.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/backend_canonselphyneo.c b/backend_canonselphyneo.c
index 6f90968..0068ba3 100644
--- a/backend_canonselphyneo.c
+++ b/backend_canonselphyneo.c
@@ -347,7 +347,7 @@ top:
return CUPS_BACKEND_STOP;
}
- if (rdback.data[0] > 0x02 && fast_return) {
+ if (rdback.data[0] > 0x02 && fast_return && copies <= 1) {
INFO("Fast return mode enabled.\n");
break;
}
@@ -397,7 +397,7 @@ static void selphyneo_cmdline(void)
struct dyesub_backend canonselphyneo_backend = {
.name = "Canon SELPHY CPneo",
- .version = "0.09",
+ .version = "0.10",
.uri_prefix = "canonselphyneo",
.cmdline_usage = selphyneo_cmdline,
.cmdline_arg = selphyneo_cmdline_arg,
diff --git a/backend_dnpds40.c b/backend_dnpds40.c
index 518c4f6..90abc50 100644
--- a/backend_dnpds40.c
+++ b/backend_dnpds40.c
@@ -1570,7 +1570,7 @@ top:
}
sleep(1); /* Give things a moment */
- if (fast_return) {
+ if (fast_return && !ctx->manual_copies) {
INFO("Fast return mode enabled.\n");
} else {
INFO("Waiting for job to complete...\n");
@@ -2488,7 +2488,7 @@ static int dnpds40_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend dnpds40_backend = {
.name = "DNP DS40/DS80/DSRX1/DS620",
- .version = "0.92",
+ .version = "0.93",
.uri_prefix = "dnpds40",
.cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg,
diff --git a/backend_mitsu70x.c b/backend_mitsu70x.c
index 82d2b3b..cb21eb7 100644
--- a/backend_mitsu70x.c
+++ b/backend_mitsu70x.c
@@ -1713,7 +1713,7 @@ skip_status:
break;
}
- if (fast_return) {
+ if (fast_return && copies <= 1) { /* Copies generated by backend! */
INFO("Fast return mode enabled.\n");
break;
}
@@ -1953,7 +1953,7 @@ static int mitsu70x_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend mitsu70x_backend = {
.name = "Mitsubishi CP-D70/D707/K60/D80",
- .version = "0.68",
+ .version = "0.69",
.uri_prefix = "mitsu70x",
.cmdline_usage = mitsu70x_cmdline,
.cmdline_arg = mitsu70x_cmdline_arg,