From 97b61e663e47e6bd6ee6ff460895a7370b3c6159 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 19 Oct 2021 12:09:02 +0200 Subject: caja-file-operations: overlapping comparisons always evaluate to true --- libcaja-private/caja-file-operations.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libcaja-private') 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 -- cgit v1.2.1