From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 28 May 2019 23:28:58 +0000 (+0100)
Subject: JAL-3277 Fixed getdown splashscreen. For unknown reasons getdown thought it had both... 
X-Git-Tag: Release_2_11_1_0~53^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8afc96dd4cc03874d265527ed2565fd2aedff8ea;p=jalview.git

JAL-3277 Fixed getdown splashscreen. For unknown reasons getdown thought it had both ui.background_image and ui.rotating_background and so defaulted to using ui.rotating_background even though this was not provided. Changed it to default to ui.background_image.
---

diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
index c09d3e4..4a90866 100644
Binary files a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar and b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 321b5ce..aeb6e0c 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
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 66629f2..539b47e 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
@@ -807,10 +807,10 @@ public abstract class Getdown extends Thread
         if (_ifc.rotatingBackgrounds != null) {
             if (_ifc.backgroundImage != null) {
                 log.warning("ui.background_image and ui.rotating_background were both specified. " +
-                            "The rotating images are being used.");
+                            "The background image is being used.");
             }
-            return new RotatingBackgrounds(_ifc.rotatingBackgrounds, _ifc.errorBackground,
-                Getdown.this);
+            return new RotatingBackgrounds(loadImage(_ifc.backgroundImage));
+            //return new RotatingBackgrounds(_ifc.rotatingBackgrounds, _ifc.errorBackground, Getdown.this);
         } else if (_ifc.backgroundImage != null) {
             return new RotatingBackgrounds(loadImage(_ifc.backgroundImage));
         } else {
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index c09d3e4..4a90866 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index c09d3e4..4a90866 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ