[gnome-commander] Handle error if a file can not be moved when renaming it at the same time

[Uwe Scholz <uwescholz src gnome org>]

commit c57d786c4377053167cc3a08efaf586b6336342c
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Tue Sep 14 21:54:21 2021 +0200

    Handle error if a file can not be moved when renaming it at the same time

 src/gnome-cmd-xfer.cc | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/src/gnome-cmd-xfer.cc b/src/gnome-cmd-xfer.cc
index 932fb502..8ea1dcee 100644
--- a/src/gnome-cmd-xfer.cc
+++ b/src/gnome-cmd-xfer.cc
@@ -1165,12 +1165,29 @@ gnome_cmd_move_gfile_recursive (GFile *srcGFile,
                     case COPY_ERROR_ACTION_RENAME:
                         xferData->problem_action = COPY_ERROR_ACTION_NO_ACTION_YET;
                         set_new_nonexisting_dest_gfile(srcGFile, &destGFile, xferData);
-                        // ToDo: Handle tmpError, also on other occurences!
                         g_file_move(srcGFile, destGFile, copyFlags, nullptr, update_transferred_data, 
xferDataPointer, &tmpError);
+                        if (tmpError)
+                        {
+                            g_warning("g_file_move error: %s\n", tmpError->message);
+                            g_propagate_error(&(xferData->error), tmpError);
+                            xferData->problemSrcGFile = g_file_dup(srcGFile);
+                            xferData->problemDestGFile = g_file_dup(destGFile);
+                            xfer_progress_update(xferData);
+                            return false;
+                        }
                         break;
                     case COPY_ERROR_ACTION_RENAME_ALL:
                         set_new_nonexisting_dest_gfile(srcGFile, &destGFile, xferData);
                         g_file_move(srcGFile, destGFile, copyFlags, nullptr, update_transferred_data, 
xferDataPointer, &tmpError);
+                        if (tmpError)
+                        {
+                            g_warning("g_file_move error: %s\n", tmpError->message);
+                            g_propagate_error(&(xferData->error), tmpError);
+                            xferData->problemSrcGFile = g_file_dup(srcGFile);
+                            xferData->problemDestGFile = g_file_dup(destGFile);
+                            xfer_progress_update(xferData);
+                            return false;
+                        }
                         break;
                     case COPY_ERROR_ACTION_SKIP:
                         xferData->problem_action = COPY_ERROR_ACTION_NO_ACTION_YET;