Get rid of the installer nonsense.

[jarrg-owen.git] / src / com / tedpearson / ypp / market / MarketUploader.java

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 8e0c109d93a0a47aa43b86e8b7e9a3dcac16a322..306c7d72c13869ccb4dce3badae2971577078de7 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -307,7 +307,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                try {
                        islandName = ((JLabel)leagueTracker).getToolTipText();
                } catch (NullPointerException e) {
-                       
                        // evidently we're actually on an island
 
                        islandName = null;
@@ -389,7 +388,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                getIsland();
                getOcean();
 
-               latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
+               if (latch != null) {
+                   latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
+               }
 
                ArrayList<ArrayList<String>> data = getData(t);