[gnome-commander] When 'abort' was selected, set deleteData->stop = TRUE; set deleted with &= operator
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] When 'abort' was selected, set deleteData->stop = TRUE; set deleted with &= operator
- Date: Sun, 28 Nov 2021 21:34:24 +0000 (UTC)
commit 1df19cb19d89f0fb233363d0903b3be4291ec1f6
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sun Nov 28 22:21:07 2021 +0100
When 'abort' was selected, set deleteData->stop = TRUE; set deleted with &= operator
src/dialogs/gnome-cmd-delete-dialog.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-delete-dialog.cc b/src/dialogs/gnome-cmd-delete-dialog.cc
index 74e1bf8e..94dad68c 100644
--- a/src/dialogs/gnome-cmd-delete-dialog.cc
+++ b/src/dialogs/gnome-cmd-delete-dialog.cc
@@ -151,18 +151,18 @@ static gboolean perform_delete_subdirs(GnomeCmdDir *gnomeCmdDir, DeleteData *del
gboolean deleted = TRUE;
for (GList *dirChildItem = gnome_cmd_dir_get_files (gnomeCmdDir); dirChildItem; dirChildItem =
dirChildItem->next)
{
- // 'deleted' can be set below within this for-loop
- if (!deleted && deleteData->problem_action == DELETE_ERROR_ACTION_ABORT)
+ if (deleteData->problem_action == DELETE_ERROR_ACTION_ABORT)
{
+ deleteData->stop = TRUE;
gnome_cmd_dir_unref (gnomeCmdDir);
return FALSE;
}
- if (!deleted && deleteData->problem_action == DELETE_ERROR_ACTION_RETRY)
+ if (deleteData->problem_action == DELETE_ERROR_ACTION_RETRY)
{
dirChildItem = dirChildItem->prev ? dirChildItem->prev : dirChildItem;
deleteData->problem_action = -1;
}
- if (!deleted && deleteData->problem_action == DELETE_ERROR_ACTION_SKIP)
+ if (deleteData->problem_action == DELETE_ERROR_ACTION_SKIP)
{
// just go on and set problem_action to the default value
deleteData->problem_action = -1;
@@ -175,7 +175,7 @@ static gboolean perform_delete_subdirs(GnomeCmdDir *gnomeCmdDir, DeleteData *del
GList *childsList = nullptr;
childsList = g_list_append(childsList, gnomeCmdFile);
- deleted = perform_delete_operation_r (deleteData, childsList);
+ deleted &= perform_delete_operation_r (deleteData, childsList);
g_list_free(childsList);
}
return deleted;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]