X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;h=fe4b7ef813465b74b7460ee73efd5bbb67869f17;hb=726bda0e9aea2d68b90803e142346cc46c8d4772;hp=b8d31c23d08c0bcb4646e2713c30c9051ecf4f88;hpb=9bcd0b0ffcccc233c93ac761084dd8bfa7c5fd5a;p=jalview.git

diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index b8d31c2..fe4b7ef 100644
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@ -104,6 +104,23 @@ public class Launcher
       }
     }
 
+    // use saved preferences if no cmdline args
+    boolean useCustomisedSettings = Boolean.parseBoolean(LaunchUtils
+            .getUserPreference(MemorySetting.CUSTOMISED_SETTINGS));
+    if (useCustomisedSettings)
+    {
+      if (jvmmempc == null)
+      {
+        jvmmempc = LaunchUtils
+                .getUserPreference(MemorySetting.MEMORY_JVMMEMPC);
+      }
+      if (jvmmemmax == null)
+      {
+        jvmmemmax = LaunchUtils
+                .getUserPreference(MemorySetting.MEMORY_JVMMEMMAX);
+      }
+    }
+
     // add memory setting if not specified
     boolean memSet = false;
     boolean dockIcon = false;
@@ -226,7 +243,6 @@ public class Launcher
       e.printStackTrace();
     }
     // System.exit(0);
-
   }
 
 }