From 162d9b5066f84b9dd5343f3c106b68a5f9ac02a6 Mon Sep 17 00:00:00 2001
From: rsudev <rasch@munin-soft.de>
Date: Sun, 25 Aug 2013 15:04:19 +0200
Subject: Fixes #3188, NPE with map menu (mapsforge 024)

Move menu inflation from resource to mapBase (AbstractMap)
---
 main/src/cgeo/geocaching/maps/AbstractMap.java                    | 5 ++++-
 main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java       | 5 +----
 main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/maps/AbstractMap.java b/main/src/cgeo/geocaching/maps/AbstractMap.java
index d9ee751..d341823 100644
--- a/main/src/cgeo/geocaching/maps/AbstractMap.java
+++ b/main/src/cgeo/geocaching/maps/AbstractMap.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.maps;
 
+import cgeo.geocaching.R;
 import cgeo.geocaching.maps.interfaces.MapActivityImpl;
 
 import android.app.Activity;
@@ -50,7 +51,9 @@ public abstract class AbstractMap {
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        return mapActivity.superOnCreateOptionsMenu(menu);
+        final boolean result = mapActivity.superOnCreateOptionsMenu(menu);
+        mapActivity.getActivity().getMenuInflater().inflate(R.menu.map_activity, menu);
+        return result;
     }
 
     public boolean onPrepareOptionsMenu(Menu menu) {
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index dcff363..a98241f 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.maps.google;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.activity.FilteredActivity;
 import cgeo.geocaching.maps.AbstractMap;
 import cgeo.geocaching.maps.CGeoMap;
@@ -84,9 +83,7 @@ public class GoogleMapActivity extends MapActivity implements MapActivityImpl, F
 
     @Override
     public boolean superOnCreateOptionsMenu(Menu menu) {
-        final boolean result = super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.map_activity, menu);
-        return result;
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
index 232fe3c..a0384b8 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
@@ -1,6 +1,5 @@
 package cgeo.geocaching.maps.mapsforge;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.activity.FilteredActivity;
 import cgeo.geocaching.maps.AbstractMap;
 import cgeo.geocaching.maps.CGeoMap;
@@ -79,9 +78,7 @@ public class MapsforgeMapActivity extends MapActivity implements MapActivityImpl
 
     @Override
     public boolean superOnCreateOptionsMenu(Menu menu) {
-        final boolean result = super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.map_activity, menu);
-        return result;
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
-- 
cgit v1.1