From dcbae9969623f318b2a2bc0dd155e555f1848658 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 21 Sep 2016 21:28:19 -0700 Subject: [PATCH] [SabreTools] Stop conflict between DFD and output formats --- SabreTools/SabreTools.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs index 104bacdd..9d5b9b62 100644 --- a/SabreTools/SabreTools.cs +++ b/SabreTools/SabreTools.cs @@ -519,7 +519,7 @@ namespace SabreTools } // If more than one switch is enabled, show the help screen - if (!(datfromdir ^ extsplit ^ hashsplit ^ headerer ^ (merge || diffMode != 0 || update + if (!(extsplit ^ hashsplit ^ headerer ^ (datfromdir || merge || diffMode != 0 || update || outputFormat != 0 || tsv != null|| trim) ^ rem ^ stats ^ typesplit)) { _logger.Error("Only one feature switch is allowed at a time");