Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-21 09:28:56 +01:00
commit a9ad98ea67

View file

@ -67,14 +67,14 @@ public class DashFavoritesFragment extends DashBaseFragment {
@Override
public void onResume() {
super.onResume();
if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
//if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
// if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
// show first time when application ran
location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
} else {
location = getLocationProvider().getLastKnownLocation();
}
updateLocation(location);
// location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
// } else {
// location = getLocationProvider().getLastKnownLocation();
// }
// updateLocation(location);
}