stupid stumbling over own feet, but seems better now.

[feisty_meow.git] / octopi / library / tentacles / recursive_file_copy.cpp

diff --git a/octopi/library/tentacles/recursive_file_copy.cpp b/octopi/library/tentacles/recursive_file_copy.cpp
index a159c41c0622493b3f82db6c3ea847372771b8c0..0b33269f73f858fadb768b12fe6a87ea366fc43f 100644 (file)
--- a/octopi/library/tentacles/recursive_file_copy.cpp
+++ b/octopi/library/tentacles/recursive_file_copy.cpp
@@ -165,6 +165,12 @@ outcome recursive_file_copy::copy_hierarchy(int transfer_mode,
     if (!reply)
       RETURN_ERROR_RFC("failed to get ongoing transfer reply", NONE_READY);
 
+    if (reply->_command == file_transfer_infoton::CONCLUDE_TRANSFER_MARKER) {
+      BASE_LOG(astring("finished transfer from \"") + source_dir
+          + "\" to \"" + target_dir + "\"");
+      break;
+    }
+
     byte_array copy = reply->_packed_data;
     while (copy.length()) {
       file_time empty;
@@ -178,18 +184,11 @@ outcome recursive_file_copy::copy_hierarchy(int transfer_mode,
 
 //hmmm: this needs better formatting, and should not repeat the same file name even
 //      if it's in multiple chunks.
-//hmmm: if logging, then...
       BASE_LOG(head.readable_text_form());
     }
     if (copy.length())
       RETURN_ERROR_RFC("still had data in array", GARBAGE);
 
-    if (reply->_command == file_transfer_infoton::CONCLUDE_TRANSFER_MARKER) {
-      BASE_LOG(astring("finished transfer from \"") + source_dir
-          + "\" to \"" + target_dir + "\"");
-      break;
-    }
-
     octopus_request_id resp_id(ent, iter + 11);
     outcome resp_ret = client_spider.evaluate(reply, resp_id);
     if (resp_ret != tentacle::OKAY)