From ff2617e6e4d58a29b3e78fe0e308b07535f831f8 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sat, 25 Mar 2017 01:30:01 +0800
Subject: [PATCH] Support --conflict override for disk folders

@see https://www.filebot.net/forums/viewtopic.php?f=8&t=4863&p=27193#p27190
---
 source/net/filebot/cli/CmdlineOperations.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java
index 6c2bfd67..b2f2ebdb 100644
--- a/source/net/filebot/cli/CmdlineOperations.java
+++ b/source/net/filebot/cli/CmdlineOperations.java
@@ -597,10 +597,13 @@ public class CmdlineOperations implements CmdlineInterface {
 
 						if (conflictAction == ConflictAction.OVERRIDE || (conflictAction == ConflictAction.AUTO && VideoQuality.isBetter(source, destination))) {
 							// do not delete files in test mode
-							if (renameAction.canRevert() && destination.delete()) {
-								log.info(format("[%s] Delete [%s]", conflictAction, destination));
-							} else {
-								log.warning(format("[%s] Unable to delete [%s]", conflictAction, destination));
+							if (renameAction.canRevert()) {
+								try {
+									log.info(format("[%s] Delete [%s]", conflictAction, destination));
+									delete(destination);
+								} catch (Exception e) {
+									log.warning(format("[%s] Failed to delete [%s]: %s", conflictAction, destination, e));
+								}
 							}
 						} else if (conflictAction == ConflictAction.INDEX) {
 							destination = nextAvailableIndexedName(destination);