Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 5f1f228..9e488dc 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -64,8 +64,9 @@ import com.threerings.getdown.util.LaunchUtil;
 //import edu.stanford.ejalbert.launching.IBrowserLaunching;
 import groovy.lang.Binding;
 import groovy.util.GroovyScriptEngine;
-import jalview.bin.ArgParser.Arg;
-import jalview.bin.ArgParser.BootstrapArgs;
+import jalview.bin.argparser.Arg;
+import jalview.bin.argparser.ArgParser;
+import jalview.bin.argparser.BootstrapArgs;
 import jalview.ext.so.SequenceOntology;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
@@ -415,9 +416,9 @@ public class Jalview
     String usrPropsFile = bootstrapArgs.contains(Arg.PROPS)
             ? bootstrapArgs.get(Arg.PROPS)
             : aparser.getValue("props");
-    Cache.loadProperties(usrPropsFile);
     if (usrPropsFile != null)
     {
+      Cache.loadProperties(usrPropsFile);
       System.out.println(
               "CMD [-props " + usrPropsFile + "] executed successfully!");
     }
@@ -705,7 +706,7 @@ public class Jalview
     groovyscript = aparser.getValue("groovy", true);
     file = aparser.getValue("open", true);
 
-    if (file == null && desktop == null)
+    if (file == null && desktop == null && !commandsSuccess)
     {
       Jalview.exit("No files to open!", 1);
     }
@@ -1599,7 +1600,6 @@ public class Jalview
 
   public static void exit(String message, int exitcode)
   {
-    System.err.println("####### EXITING HERE!");
     Console.debug("Using Jalview.exit");
     if (message != null)
       if (exitcode == 0)