summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-operations.c
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private/caja-file-operations.c')
-rw-r--r--libcaja-private/caja-file-operations.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index b0c15cdb..e82fe259 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -4028,7 +4028,7 @@ do_run_conflict_dialog (gpointer _data)
if (response == CONFLICT_RESPONSE_RENAME) {
data->resp_data->new_name =
caja_file_conflict_dialog_get_new_name (CAJA_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 =
caja_file_conflict_dialog_get_apply_to_all