1 files changed, 3 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 156c4b6..42b8f0a 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -817,13 +817,7 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     public boolean showSize() {
-        if (size == CacheSize.NOT_CHOSEN) {
-            return false;
-        }
-        if (isEventCache() || isVirtual()) {
-            return false;
-        }
-        return true;
+        return !(size == CacheSize.NOT_CHOSEN || isEventCache() || isVirtual());
     }
 
     public long getUpdated() {
@@ -1373,17 +1367,6 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     /**
-     * Retrieve a given waypoint.
-     *
-     * @param index
-     *            the index of the waypoint
-     * @return waypoint or <code>null</code> if index is out of range
-     */
-    public Waypoint getWaypoint(final int index) {
-        return index >= 0 && index < waypoints.size() ? waypoints.get(index) : null;
-    }
-
-    /**
      * Lookup a waypoint by its id.
      *
      * @param id
@@ -1660,6 +1643,8 @@ public class Geocache implements ICache, IWaypoint {
 
             StaticMapsProvider.downloadMaps(cache);
 
+            imgGetter.waitForBackgroundLoading(handler);
+
             if (handler != null) {
                 handler.sendMessage(Message.obtain());
             }