Merge pull request #2308 from meganz/hotfix/target-move

SDK-1267. Fix target for movements (for develop)
meganz · Oct 23, 2020 · 91a8bfd · 91a8bfd
2 parents bff05ff + 53c41df
commit 91a8bfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/include/mega/version.h b/include/mega/version.h
@@ -5,5 +5,5 @@
 #define MEGA_MINOR_VERSION 7
 #endif
 #ifndef MEGA_MICRO_VERSION
-#define MEGA_MICRO_VERSION 4
+#define MEGA_MICRO_VERSION 6
 #endif
diff --git a/src/megaapi_impl.cpp b/src/megaapi_impl.cpp
@@ -19420,12 +19420,9 @@ void MegaApiImpl::sendPendingRequests()
                         {
                             if (node->isvalid && ovn->isvalid && *(FileFingerprint*)node == *(FileFingerprint*)ovn)
                             {
-                                e = API_OK; // there is already an identical node in the target folder
-                                // continue to complete the copy-delete
-                                client->restag = request->getTag();
-                                vector<NewNode> emptyVec;
-                                putnodes_result(API_OK, NODE_HANDLE, emptyVec);
-                                break;
+                                request->setNodeHandle(UNDEF);
+                                e = client->unlink(node, false, request->getTag());
+                                break;  // request finishes now if error, otherwise on unlink_result
                             }
 
                             if (!client->versions_disabled)