diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2012-10-21 06:23:30 -0700 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-10-21 06:23:30 -0700 |
| commit | 115f1624a3802c70477928308647287ff705a3dd (patch) | |
| tree | 5ed22c2a810d0352a4dc3947917c35fd2dc115c5 | |
| parent | f4c75978d1334f0e12f49b4991b938a6f3f1a5b2 (diff) | |
| parent | 21fa1ad1689249965b49f6ec91adac7f257e52ed (diff) | |
| download | cgeo-115f1624a3802c70477928308647287ff705a3dd.zip cgeo-115f1624a3802c70477928308647287ff705a3dd.tar.gz cgeo-115f1624a3802c70477928308647287ff705a3dd.tar.bz2 | |
Merge pull request #2103 from Portree-Kid/fix_#1990
Fixes #1990 Changed saving of Map-Mode
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index fb366c8..a2848ae 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -350,7 +350,12 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto public void onSaveInstanceState(final Bundle outState) { outState.putInt(BUNDLE_MAP_SOURCE, currentSourceId); outState.putIntArray(BUNDLE_MAP_STATE, currentMapState()); - outState.putString(BUNDLE_MAP_MODE, mapMode.name()); + if (isLiveMode()) { + outState.putString(BUNDLE_MAP_MODE, mapMode.name()); + } + else { + outState.putString(BUNDLE_MAP_MODE, null); + } } @Override @@ -392,7 +397,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto if (savedInstanceState != null) { currentSourceId = savedInstanceState.getInt(BUNDLE_MAP_SOURCE, Settings.getMapSource()); mapStateIntent = savedInstanceState.getIntArray(BUNDLE_MAP_STATE); - mapMode = Enum.valueOf(MapMode.class, savedInstanceState.getString(BUNDLE_MAP_MODE)); + String lastMapmode = savedInstanceState.getString(BUNDLE_MAP_MODE); + if (lastMapmode != null) { + mapMode = Enum.valueOf(MapMode.class, lastMapmode); + } Settings.setLiveMap(mapMode == MapMode.LIVE_ONLINE); } else { |