Merge remote-tracking branch 'origin/release'

2 files changed, 7 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index ab11765..cfe9eeb 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -56,6 +56,10 @@ public class CacheMenuHandler extends AbstractUIFactory {
     }
 
     public static void onPrepareOptionsMenu(final Menu menu, final Geocache cache) {
+        //
+        if (cache == null) {
+            return;
+        }
         final boolean hasCoords = cache.getCoords() != null;
         menu.findItem(R.id.menu_default_navigation).setVisible(hasCoords);
         menu.findItem(R.id.menu_navigate).setVisible(hasCoords);
diff --git a/main/src/cgeo/geocaching/ui/LoggingUI.java b/main/src/cgeo/geocaching/ui/LoggingUI.java
index 1423da2..9f482cb 100644
--- a/main/src/cgeo/geocaching/ui/LoggingUI.java
+++ b/main/src/cgeo/geocaching/ui/LoggingUI.java
@@ -117,6 +117,9 @@ public class LoggingUI extends AbstractUIFactory {
     }
 
     public static void onPrepareOptionsMenu(Menu menu, Geocache cache) {
+        if (cache == null) {
+            return;
+        }
         final MenuItem itemLog = menu.findItem(R.id.menu_log_visit);
         itemLog.setVisible(cache.supportsLogging() && !Settings.getLogOffline());
         itemLog.setEnabled(Settings.isLogin());