From 49707fef84ca834fe86e1d1b41ec3795377012e6 Mon Sep 17 00:00:00 2001
From: iadgovuser26 <33069955+iadgovuser26@users.noreply.github.com>
Date: Mon, 18 Jul 2022 13:56:47 -0400
Subject: [PATCH] addressing comments

---
 .../main/java/hirs/tcg_eventlog/Commander.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/tcg_eventlog_tool/src/main/java/hirs/tcg_eventlog/Commander.java b/tools/tcg_eventlog_tool/src/main/java/hirs/tcg_eventlog/Commander.java
index 3d98e08e..6e1f551e 100644
--- a/tools/tcg_eventlog_tool/src/main/java/hirs/tcg_eventlog/Commander.java
+++ b/tools/tcg_eventlog_tool/src/main/java/hirs/tcg_eventlog/Commander.java
@@ -357,15 +357,14 @@ public class Commander {
      * @return false is an invalid combination was found
      */
     public final boolean checkForInvalidOptions() {
-        bValidArgs = false;
-        if (!bEventIds && (bEventHex || bContentHex)) {
-            return false;
+    	if (!bEventIds && (bEventHex || bContentHex)) {
+        	bValidArgs = false;
+        } else if (bHex && (bEventHex || bContentHex)) {
+        	bValidArgs = false;
+        } else {
+        	bValidArgs = true;
         }
-        if (bHex && (bEventHex || bContentHex)) {
-            return false;
-        }
-        bValidArgs = true;
-        return true;
+        return bValidArgs;
     }
     /**
      * Check for situations where default values need to be set.