1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index a1ab36a..b1e4b92 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -56,7 +56,7 @@ public class WaypointPopup extends AbstractPopupActivity {
     @Override
     protected void init() {
         super.init();
-        waypoint = cgData.loadWaypoint(waypointId);
+        waypoint = DataStore.loadWaypoint(waypointId);
         try {
             if (StringUtils.isNotBlank(waypoint.getName())) {
                 setTitle(waypoint.getName());
@@ -78,7 +78,7 @@ public class WaypointPopup extends AbstractPopupActivity {
 
                 @Override
                 public void onClick(View arg0) {
-                    EditWaypointActivity.startActivityEditWaypoint(WaypointPopup.this, waypoint.getId());
+                    EditWaypointActivity.startActivityEditWaypoint(WaypointPopup.this, cache, waypoint.getId());
                     finish();
                 }
             });
@@ -94,7 +94,7 @@ public class WaypointPopup extends AbstractPopupActivity {
     }
 
     @Override
-    protected void navigateTo() {
+    public void navigateTo() {
         NavigationAppFactory.startDefaultNavigationApplication(1, this, waypoint);
     }
 
@@ -119,7 +119,7 @@ public class WaypointPopup extends AbstractPopupActivity {
     }
 
     @Override
-    protected void showNavigationMenu() {
+    public void showNavigationMenu() {
         NavigationAppFactory.showNavigationMenu(this, null, waypoint, null);
     }