moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00
Code Issues Releases Wiki Activity

Fix GUI conflict behaviour

Browse Source 
@see https://www.filebot.net/forums/viewtopic.php?f=8&t=4428&p=24740#p24740
This commit is contained in:
Reinhard Pointner 2016-12-06 00:30:51 +09:00
parent a106151ca4
commit d4624fb47a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/filebot/ui/rename/ConflictDialog.java
View File

@ -275,16 +275,16 @@ class ConflictDialog extends JDialog {
issues.add("Missing extension"); 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 // one file per unique output path
if (!destFiles.add(to)) { if (!destFiles.add(to)) {
issues.add("Duplicate destination path"); 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 // check if destination path already exists
if (to.exists() && !to.equals(from)) { if (to.exists() && !to.equals(from)) {
issues.add("File already exists"); issues.add("File already exists");