From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 28 Dec 2024 17:00:28 +0000 (+0100)
Subject: fix end of scan simple-scan
X-Git-Tag: v1.0.16^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=69956407e8ba9bcf159d94a0952544b0f4c8ecdb;p=sane-kds-s2000w-net.git

fix end of scan simple-scan
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index efe087a..483c2cc 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -184,8 +184,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
 		kds_s2000w_handler_start_scan(h);
 	}
 
-	if (h->current_scan_status->feeder == 0
-		&& h->current_scan_status->downloaded_images > 0
+	if (h->current_scan_status->downloaded_images > 0
 		&& h->current_scan_status->available_images < 1)
 		return SANE_STATUS_NO_DOCS;
 
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 0407529..dc1d7e1 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -376,23 +376,11 @@ void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state)
 	memcpy(resp_status->data, status2, 210);
 	resp_status->code = 200;
 	resp_status->size = 210;
-	will_return(mock_response, resp_status);
-	will_return(__wrap_kds_s2000w_client_status_session, 0);
-	will_return(mock_response, response_list[2]);
-	will_return(__wrap_kds_s2000w_client_get_image, 0);
-	will_return(mock_response, response_list[0]);
-	will_return(__wrap_kds_s2000w_client_delete_image, 0);
-	will_return(mock_response, response_list[0]);
-	will_return(__wrap_kds_s2000w_client_stop_scan, 0);
-	expect_function_call(__wrap_kds_s2000w_client_status_session);
-	expect_function_call(__wrap_kds_s2000w_client_get_image);
-	expect_function_call(__wrap_kds_s2000w_client_delete_image);
-	expect_function_call(__wrap_kds_s2000w_client_stop_scan);
 
 	result = _sane_kds_s2000w_net_start(h);
 
-	assert_int_equal(result, SANE_STATUS_GOOD);
-	assert_int_equal(h->current_scan_status->complete_scanned, 1);
+	assert_int_equal(result, SANE_STATUS_NO_DOCS);
+	assert_int_equal(h->current_scan_status->complete_scanned, 0);
 
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;