From e0d128ba3b72700bb4d43a39267fd911b6fadb4d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 10 May 2016 15:57:09 -0700 Subject: [PATCH] Missed a couple spots --- DATabase/DATabase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index 198908e8..1272bbe3 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -300,7 +300,7 @@ namespace SabreTools } // If more than one switch is enabled or help is set, show the help screen - if (help || !(add ^ convertMiss ^ convertCMP ^ convertXml ^ extsplit ^ generate ^ genall ^ import ^ listsrc ^ listsys ^ merge ^ rem ^ trim)) + if (help || !(add ^ convertMiss ^ convertCMP ^ convertXml ^ extsplit ^ generate ^ genall ^ import ^ listsrc ^ listsys ^ (merge || diff) ^ rem ^ trim)) { Build.Help(); logger.Close(); @@ -308,7 +308,7 @@ namespace SabreTools } // If a switch that requires a filename is set and no file is, show the help screen - if (inputs.Count == 0 && (convertMiss || convertCMP || convertXml || extsplit || import || merge || trim)) + if (inputs.Count == 0 && (convertMiss || convertCMP || convertXml || extsplit || import || (merge || diff) || trim)) { Build.Help(); logger.Close();