From d4624fb47a234b1dc901627f16631c3cd72e5cca Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 6 Dec 2016 00:30:51 +0900 Subject: [PATCH] Fix GUI conflict behaviour @see https://www.filebot.net/forums/viewtopic.php?f=8&t=4428&p=24740#p24740 --- source/net/filebot/ui/rename/ConflictDialog.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/net/filebot/ui/rename/ConflictDialog.java b/source/net/filebot/ui/rename/ConflictDialog.java index 980a7c38..c4297cfb 100644 --- a/source/net/filebot/ui/rename/ConflictDialog.java +++ b/source/net/filebot/ui/rename/ConflictDialog.java @@ -275,16 +275,16 @@ class ConflictDialog extends JDialog { issues.add("Missing extension"); } - // check if input and output overlap - if (renameMap.containsKey(to)) { - issues.add("Conflict with source path"); - } - // one file per unique output path if (!destFiles.add(to)) { issues.add("Duplicate destination path"); } + // check if input and output overlap + if (renameMap.containsKey(to) && !to.equals(from)) { + issues.add("Conflict with source path"); + } + // check if destination path already exists if (to.exists() && !to.equals(from)) { issues.add("File already exists");