Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-28 21:03:45 +02:00
commit 5b71806ab5

View file

@ -382,12 +382,10 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
} }
private void setupSearch(final MapActivity mapActivity) { private void setupSearch(final MapActivity mapActivity) {
final OsmandApplication app = mapActivity.getMyApplication(); final OsmandApplication app = mapActivity.getMyApplication();
// Setup search core // Setup search core
String locale = app.getSettings().MAP_PREFERRED_LOCALE.get(); String locale = app.getSettings().MAP_PREFERRED_LOCALE.get();
searchUICore = app.getSearchUICore(); searchUICore = app.getSearchUICore().getCore();
searchUICore.resetPhrase(); searchUICore.resetPhrase();
location = app.getLocationProvider().getLastKnownLocation(); location = app.getLocationProvider().getLastKnownLocation();