X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=64e3d813088432b4e08d018a2f5bc31b2e2f343b;hb=0ddc96bc043a4fe9ba9b2947a770ae1d3969079c;hp=992ca0143f7b922d85bd30620e8a404b6727f7d1;hpb=fd4703aa3d5a598c26d336affca8215e8ea63db7;p=jalview.git

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 992ca01..64e3d81 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -371,7 +371,14 @@ public class Jalview
     // property laf = "crossplatform", "system", "gtk", "metal" or "mac"
     // If not set (or chosen laf fails), use the normal SystemLaF and if on Mac,
     // try Quaqua/Vaqua.
-    String laf = System.getProperty("laf", "none");
+    String lafProp = System.getProperty("laf");
+    String lafSetting = Cache.getDefault("PREFERRED_LAF", null);
+    String laf = "none";
+    if (lafProp != null) {
+    	laf = lafProp;
+    } else if (lafSetting != null) {
+    	laf = lafSetting;
+    }
     boolean lafSet = false;
     switch (laf)
     {