convert navigation popup menu to action menu

1 files changed, 7 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index 9c8af50..0dc6444 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -2,6 +2,7 @@ package cgeo.geocaching;
 
 import cgeo.calendar.CalendarAddon;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
+import cgeo.geocaching.apps.cache.navi.NavigationSelectionActionProvider;
 import cgeo.geocaching.ui.AbstractUIFactory;
 
 import android.app.Activity;
@@ -46,8 +47,12 @@ public class CacheMenuHandler extends AbstractUIFactory {
                 activityInterface.navigateTo();
                 return true;
             case R.id.menu_navigate:
-                activityInterface.showNavigationMenu();
-                return true;
+                final NavigationSelectionActionProvider navigationProvider = (NavigationSelectionActionProvider) MenuItemCompat.getActionProvider(item);
+                if (navigationProvider == null) {
+                    activityInterface.showNavigationMenu();
+                    return true;
+                }
+                return false;
             case R.id.menu_caches_around:
                 activityInterface.cachesAround();
                 return true;