aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2013-05-13 07:31:09 +0200
committerrsudev <rasch@munin-soft.de>2013-05-13 07:31:24 +0200
commit2799707935bbfbee7aa7b7b48ace480e8b7b4f43 (patch)
treee4176022a18e4aa4518f6b64194d9ab5afef07b5 /main
parent42a3f52232d6e85aecf65671d5e3452860f7b155 (diff)
downloadcgeo-2799707935bbfbee7aa7b7b48ace480e8b7b4f43.zip
cgeo-2799707935bbfbee7aa7b7b48ace480e8b7b4f43.tar.gz
cgeo-2799707935bbfbee7aa7b7b48ace480e8b7b4f43.tar.bz2
Fixes #2715, NPE when activiating menu on map
Additionally fixed single select group in map sources menu
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java1
-rw-r--r--main/src/cgeo/geocaching/maps/MapProviderFactory.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 33dcfd4..89d1cdc 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -525,6 +525,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// menu inflation happens in Google/Mapsforge specific classes
+ super.onCreateOptionsMenu(menu);
MapProviderFactory.addMapviewMenuItems(menu);
diff --git a/main/src/cgeo/geocaching/maps/MapProviderFactory.java b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
index d1b5c3b..5ce8ab6 100644
--- a/main/src/cgeo/geocaching/maps/MapProviderFactory.java
+++ b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
@@ -54,6 +54,7 @@ public class MapProviderFactory {
final int id = mapSource.getNumericalId();
parentMenu.add(R.id.menu_group_map_sources, id, i, mapSource.getName()).setCheckable(true).setChecked(id == currentSource);
}
+ parentMenu.setGroupCheckable(R.id.menu_group_map_sources, true, true);
}
public static MapSource getMapSource(int id) {