From 3d7fd1ddb2efc2960dbbc86da4665030235c6332 Mon Sep 17 00:00:00 2001 From: Jan-Pascal van Best Date: Wed, 8 Apr 2015 23:07:40 +0200 Subject: [PATCH] Do not attempt to read config file when asked for capabilities. #19 --- src/main/java/org/vanbest/xmltv/Main.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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; } -- 2.39.5