diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-07-18 10:58:54 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-07-18 10:58:54 +0200 |
| commit | 6434e7c4c0afd2e5c28ec8469a874b7eae8af52b (patch) | |
| tree | 1adb08361cca5a0c2b9e449941f54e21772dddd1 | |
| parent | 8b9a033ca671069815c958f8288fcbd75088eed1 (diff) | |
| download | nautilus-6434e7c4c0afd2e5c28ec8469a874b7eae8af52b.tar.gz | |
file-operations: fix apply to all in conflict dialog
The condition when cancelling the dialog was always true, and therefore
always setting the apply_to_all.
It was harmless due to the dialog being canceled anyway.
Thanks to Michael McConville to create the original patch.
| -rw-r--r-- | src/nautilus-file-operations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index 1ec55919c..8ec8f064d 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -4426,7 +4426,7 @@ do_run_conflict_dialog (gpointer _data) if (response == CONFLICT_RESPONSE_RENAME) { data->resp_data->new_name = nautilus_file_conflict_dialog_get_new_name (NAUTILUS_FILE_CONFLICT_DIALOG (dialog)); - } else if (response != GTK_RESPONSE_CANCEL || + } else if (response != GTK_RESPONSE_CANCEL && response != GTK_RESPONSE_NONE) { data->resp_data->apply_to_all = nautilus_file_conflict_dialog_get_apply_to_all |