change move reset handler into recreate session

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 6f8aec72d2a410755fa6d1b260d6bd8548536e5a..91db818e89b15d0186287b42cb593ec38ce2f9c6 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -288,6 +288,7 @@ void kds_s2000w_handler_close(handler_t* h)
 
 void kds_s2000w_handler_recreate_session(handler_t* h)
 {
+       kds_s2000w_handler_reset(h);
        kds_s2000w_client_close_session(h->sessionid);
 
        response_t* resp = kds_s2000w_client_response_init();

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index c2df448d2519ed801173c347e7296aca62c4f4a6..4a02c9328d225628f718bd1439e71f06c73c3d92 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -217,7 +217,6 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 
        if (h->scan_status->state == CANCLED) {
                kds_s2000w_debug_printf(DEBUG, "scan completed canceled");
-               kds_s2000w_handler_reset(h);
                kds_s2000w_handler_recreate_session(h);
                return;
        }
@@ -232,7 +231,6 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 
        if (h->scan_status->available_images == 0) {
                kds_s2000w_debug_printf(DEBUG, "scan completed no availible images");
-               kds_s2000w_handler_reset(h);
                kds_s2000w_handler_recreate_session(h);
                return;
        }