X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=getdown%2Fsrc%2Fgetdown%2Flauncher%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Flauncher%2FGetdown.java;h=f64959ba5fc0dfe097e719c1da63120719e8ccb8;hb=e71869cde71ac42b05f9a1c45776dc5bb7f469d7;hp=ba238de7b831cf8604363997468f24582bda7a9b;hpb=91e1a778afa1d0752d9d7ec6e1f2a9bf64b9fb09;p=jalview.git 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..f64959b 100644 --- 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 @@ -1124,16 +1124,18 @@ 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(); + log.warning("INVOKEANDWAIT", "shownContainer", _shownContainer); } catch (Exception e) { log.warning("Tried to invokeAndWait but couldn't. Going to invokeLater instead", "Exception", e.getMessage()); EventQueue.invokeLater(r); } } else { EventQueue.invokeLater(r); + log.warning("INVOKELATER", "ifc", _ifc, "shownContainer", _shownContainer); //r.run(); } @@ -1159,13 +1161,15 @@ public abstract class Getdown extends Thread protected boolean _launchInSilent; protected boolean _noUpdate; protected long _startup; - + protected Set _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;