Open new Popup for Waypoints from Map

1 files changed, 5 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/maps/CachesOverlay.java b/main/src/cgeo/geocaching/maps/CachesOverlay.java
index 9ca206e..c94c014 100644
--- a/main/src/cgeo/geocaching/maps/CachesOverlay.java
+++ b/main/src/cgeo/geocaching/maps/CachesOverlay.java
@@ -2,8 +2,8 @@ package cgeo.geocaching.maps;
 
 import cgeo.geocaching.IWaypoint;
 import cgeo.geocaching.Settings;
+import cgeo.geocaching.WaypointPopup;
 import cgeo.geocaching.cgeopopup;
-import cgeo.geocaching.cgeowaypoint;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
@@ -231,7 +231,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
                 cgeopopup.startActivity(context, coordinate.getGeocode());
             } else if (coordinate.getCoordType() != null && coordinate.getCoordType().equalsIgnoreCase("waypoint") && coordinate.getId() > 0) {
                 CGeoMap.markCacheAsDirty(coordinate.getGeocode());
-                cgeowaypoint.startActivity(context, coordinate.getId());
+                WaypointPopup.startActivity(context, coordinate.getId(), coordinate.getGeocode());
             } else {
                 waitDialog.dismiss();
                 return false;
@@ -240,6 +240,9 @@ public class CachesOverlay extends AbstractItemizedOverlay {
             waitDialog.dismiss();
         } catch (Exception e) {
             Log.e("cgMapOverlay.onTap: " + e.toString());
+            if (waitDialog != null) {
+                waitDialog.dismiss();
+            }
         }
 
         return false;