From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Wed, 8 Apr 2015 21:07:40 +0000 (+0200)
Subject: Do not attempt to read config file when asked for capabilities. #19
X-Git-Tag: v1.6.5~4
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=3d7fd1ddb2efc2960dbbc86da4665030235c6332;p=tv_grab_nl_java

Do not attempt to read config file when asked for capabilities. #19
---

diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index e98be90..6260a16 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -439,6 +439,10 @@ public class Main {
 			action = ACTION_DESCRIPTION;
 			return action; // do not read config file
 		}
+		if (line.hasOption("capabilities")) {
+			action = ACTION_CAPABILITIES;
+			return action; // do not try to read config file
+		}
 		if (line.hasOption("config-file")) {
 			configFile = new File(line.getOptionValue("config-file"));
 		}
@@ -472,9 +476,6 @@ public class Main {
 		if (line.hasOption("offset")) {
 			this.offset = Integer.parseInt(line.getOptionValue("offset"));
 		}
-		if (line.hasOption("capabilities")) {
-			action = ACTION_CAPABILITIES;
-		}
 		if (line.hasOption("configure")) {
 			action = ACTION_CONFIGURE;
 		}