JAL-3210 cache getdown config, remove jvmmem options for better defaults

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / Application.java

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index f41bf6a..7cc3e09 100644 (file)
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -584,6 +584,10 @@ public class Application
     public Config init (boolean checkPlatform)
         throws IOException
     {
+       if (_initialised && _initialisedConfig != null)
+       {
+               return _initialisedConfig;
+       }
         Config config = null;
         File cfgfile = _config;
         Config.ParseOpts opts = Config.createOpts(checkPlatform);
@@ -845,6 +849,8 @@ public class Application
         _dockName = config.getString("ui.name");
         _dockIconPath = config.getString("ui.mac_dock_icon", "../desktop.icns");
 
+        _initialised = true;
+        _initialisedConfig = config;
         return config;
     }
 
@@ -1995,4 +2001,7 @@ public class Application
     protected static File _locatorFile;
     protected static List<File> _startupFiles = new ArrayList<>();
     public static final String LOCATOR_FILE_EXTENSION = "jvl";
+
+    private boolean _initialised = false;
+    private Config _initialisedConfig = null;
 }