Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-03 19:05:29 +01:00
commit f208a64aaf

View file

@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
LatLon l = new LatLon(lat, lon); LatLon l = new LatLon(lat, lon);
if(!Algorithms.objectEquals(reqSearchPoint, l)){ if(!Algorithms.objectEquals(reqSearchPoint, l)){
reqSearchPoint = l; reqSearchPoint = l;
if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation()) { if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation())) {
updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
} else { } else {
updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true);