Merge branch 'JAL-3322_getdown_speed_improvement' into develop

[jalview.git] / getdown / src / getdown / launcher / src / main / java / com / threerings / getdown / launcher / Getdown.java

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
index ba238de..01bf370 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
@@ -981,7 +981,7 @@ public abstract class Getdown extends Thread
             }
         });
         
-        if (! _addedStatusLayer) {
+        if (_status != null && ! _addedStatusLayer) {
                _layers.add(_status, Integer.valueOf(2));
                _addedStatusLayer = true;
                initInterface();
@@ -1124,7 +1124,7 @@ public abstract class Getdown extends Thread
       } catch (Exception e) {
         log.warning("Could't read config when invoking GUI action", "Exception", e.getMessage());
       }
-      if (_ifc != null && _ifc.progressSync) {
+      if (_ifc != null && (_shownContainer?_ifc.progressSyncAfterShown:_ifc.progressSync)) {
         try {
           EventQueue.invokeAndWait(r);
           //r.run();
@@ -1159,13 +1159,15 @@ public abstract class Getdown extends Thread
     protected boolean _launchInSilent;
     protected boolean _noUpdate;
     protected long _startup;
-    
+ 
     protected Set<Resource> _toInstallResources;
     protected boolean _readyToInstall;
 
     protected boolean _enableTracking = true;
     protected int _reportedProgress = 0;
 
+    protected boolean _shownContainer;
+
     /** Number of minutes to wait after startup before beginning any real heavy lifting. */
     protected int _delay;