diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-31 23:16:16 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-31 23:16:16 +0200 |
| commit | 33dfeb0b43fe8df21752526f9b6614abecc7cca4 (patch) | |
| tree | 17d91e6dafefe45570e0fc67d7bba6d5b12b3086 | |
| parent | 8a553ba45606c3b2cbeb2bfa9dd84edf25ae2b39 (diff) | |
| parent | 6b794ef25bd8aaec8649519009de7b8df6afb148 (diff) | |
| download | cgeo-33dfeb0b43fe8df21752526f9b6614abecc7cca4.zip cgeo-33dfeb0b43fe8df21752526f9b6614abecc7cca4.tar.gz cgeo-33dfeb0b43fe8df21752526f9b6614abecc7cca4.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index bd390e4..5b3e805 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -1490,9 +1490,12 @@ public class CGeoMap extends AbstractMap implements ViewFactory { // switch My Location button image private void switchMyLocationButton() { - myLocSwitch.setChecked(followMyLocation); - if (followMyLocation) { - myLocationInMiddle(app.currentGeo()); + // FIXME: temporary workaround for the absence of "follow my location" on Android 3.x (see issue #4289). + if (myLocSwitch != null) { + myLocSwitch.setChecked(followMyLocation); + if (followMyLocation) { + myLocationInMiddle(app.currentGeo()); + } } } |