summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@gnome.org>2018-02-27 22:35:36 +0200
committerCarlos Soriano <csoriano1618@gmail.com>2018-03-01 08:37:51 +0000
commitec7108095ef3f3537328836063a8c4fb3b585e4a (patch)
tree4e9517921503b87901b84aec834e3217ea674bfb
parent6286e0a07959f171a4bc8d6c4e3dabd52d8ad8ee (diff)
downloadnautilus-ec7108095ef3f3537328836063a8c4fb3b585e4a.tar.gz
operations-ui-manager: fix meaningless test
The disjunction of two mutually exclusive conditions is tautological. I’m guessing this should’ve been a conjunction.
-rw-r--r--src/nautilus-operations-ui-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c
index 474eae619..33266830a 100644
--- a/src/nautilus-operations-ui-manager.c
+++ b/src/nautilus-operations-ui-manager.c
@@ -460,7 +460,7 @@ run_file_conflict_dialog (gpointer user_data)
data->response->new_name =
nautilus_file_conflict_dialog_get_new_name (data->dialog);
}
- else if (response_id != GTK_RESPONSE_CANCEL ||
+ else if (response_id != GTK_RESPONSE_CANCEL &&
response_id != GTK_RESPONSE_NONE)
{
data->response->apply_to_all =