summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-10-19 12:09:02 +0200
committerLuke from DC <[email protected]>2022-02-09 03:40:14 +0000
commit97b61e663e47e6bd6ee6ff460895a7370b3c6159 (patch)
treeba2c0a58304deac77758dad9cf12701d8336e67d
parentc66eccc6585f9a4fd7ef4e4443487e64ec1a95b8 (diff)
downloadcaja-97b61e663e47e6bd6ee6ff460895a7370b3c6159.tar.bz2
caja-97b61e663e47e6bd6ee6ff460895a7370b3c6159.tar.xz
caja-file-operations: overlapping comparisons always evaluate to true
-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