From: Bastian Dehn <hhaalo@arcor.de>
Date: Thu, 28 Mar 2024 17:56:16 +0000 (+0100)
Subject: cancel start or parameter return good
X-Git-Tag: v1.0.0^2~46^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=ff0cc206cd554f8af04037fa519cab8e8740ed69;p=sane-kds-s2000w-net.git

cancel start or parameter return good
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 51a979f..602b5ed 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -128,7 +128,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 	handler* h = (handler*) handle;
 
 	if (h->read_info->cancel)
-		return SANE_STATUS_CANCELLED;
+		return SANE_STATUS_GOOD;
 
 	params->format = h->current_metadata->format;
 	params->last_frame = h->current_metadata->is_last;
@@ -164,7 +164,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
 	}
 
 	if (h->read_info->cancel)
-		return SANE_STATUS_CANCELLED;
+		return SANE_STATUS_GOOD;
 
 	for (int i = 0; i < 200; i++) {
 		usleep(500000);
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 3107ff2..bac356a 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -534,7 +534,7 @@ void sane_kds_s2000w_net_start_cancel()
 	SANE_Status status = _sane_kds_s2000w_net_start(h);
 
 	assert_int_equal(h->read_info->cancel, 1);
-	assert_int_equal(status, SANE_STATUS_CANCELLED);
+	assert_int_equal(status, SANE_STATUS_GOOD);
 
 	free_handler(h);
 	h = NULL;
@@ -868,7 +868,7 @@ void sane_kds_s2000w_net_get_parameter_cancel()
 	SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, NULL);
 
 	assert_int_equal(h->read_info->cancel, 1);
-	assert_int_equal(status, SANE_STATUS_CANCELLED);
+	assert_int_equal(status, SANE_STATUS_GOOD);
 
 	free_handler(h);
 	h = NULL;