aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2013-08-25 15:04:19 +0200
committerrsudev <rasch@munin-soft.de>2013-08-25 15:19:14 +0200
commit162d9b5066f84b9dd5343f3c106b68a5f9ac02a6 (patch)
tree40e5681b6d3308d3b8b5287629eed6c3426e2b58 /main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
parentc5f97f5dfb2364beb5ea4707185ac404e64fc97f (diff)
downloadcgeo-162d9b5066f84b9dd5343f3c106b68a5f9ac02a6.zip
cgeo-162d9b5066f84b9dd5343f3c106b68a5f9ac02a6.tar.gz
cgeo-162d9b5066f84b9dd5343f3c106b68a5f9ac02a6.tar.bz2
Fixes #3188, NPE with map menu (mapsforge 024)
Move menu inflation from resource to mapBase (AbstractMap)
Diffstat (limited to 'main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java')
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java5
1 files changed, 1 insertions, 4 deletions
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