1 files changed, 6 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index b089dde..1210efc 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -22,7 +22,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -134,9 +133,7 @@ public class cgeopopup extends AbstractActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, 2, 0, NavigationAppFactory.getDefaultNavigationApplication(this).getName()).setIcon(android.R.drawable.ic_menu_compass); // default navigation tool
-
-        SubMenu subMenu = menu.addSubMenu(1, 0, 0, res.getString(R.string.cache_menu_navigate)).setIcon(android.R.drawable.ic_menu_mapmode);
-        NavigationAppFactory.addMenuItems(subMenu, this);
+        menu.add(0, 3, 0, res.getString(R.string.cache_menu_navigate)).setIcon(android.R.drawable.ic_menu_mapmode);
         addVisitMenu(menu, cache);
         menu.add(0, 5, 0, res.getString(R.string.cache_menu_around)).setIcon(android.R.drawable.ic_menu_rotate); // caches around
         menu.add(0, 7, 0, res.getString(R.string.cache_menu_browser)).setIcon(android.R.drawable.ic_menu_info_details); // browser
@@ -150,12 +147,12 @@ public class cgeopopup extends AbstractActivity {
 
         try {
             if (cache != null && cache.getCoords() != null) {
-                menu.findItem(0).setVisible(true);
                 menu.findItem(2).setVisible(true);
+                menu.findItem(3).setVisible(true);
                 menu.findItem(5).setVisible(true);
             } else {
-                menu.findItem(0).setVisible(false);
                 menu.findItem(2).setVisible(false);
+                menu.findItem(3).setVisible(false);
                 menu.findItem(5).setVisible(false);
             }
 
@@ -175,6 +172,9 @@ public class cgeopopup extends AbstractActivity {
         if (menuItem == 2) {
             navigateTo();
             return true;
+        } else if (menuItem == 3) {
+            NavigationAppFactory.showNavigationMenu(geo, this, cache, null, null, null);
+            return true;
         } else if (menuItem == 5) {
             cachesAround();
             return true;
@@ -187,10 +187,6 @@ public class cgeopopup extends AbstractActivity {
             return true;
         }
 
-        if (NavigationAppFactory.onMenuItemSelected(item, geo, this, cache, null, null, null)) {
-            return true;
-        }
-
         int logType = menuItem - MENU_LOG_VISIT_OFFLINE;
         cache.logOffline(this, LogType.getById(logType));
         return true;