Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-10 01:06:27 +01:00
commit a567196583

View file

@ -156,7 +156,7 @@ public class DashWaypointsFragment extends DashLocationFragment {
return true; return true;
} }
}); });
boolean target = model == getMyApplication().getTargetPointsHelper().getPointToNavigate(); final boolean target = model == getMyApplication().getTargetPointsHelper().getPointToNavigate();
if(SHOW_ALL && getMyApplication().getTargetPointsHelper().getIntermediatePoints().size() > 0) { if(SHOW_ALL && getMyApplication().getTargetPointsHelper().getIntermediatePoints().size() > 0) {
final List<TargetPoint> allTargets = getMyApplication().getTargetPointsHelper().getIntermediatePointsWithTarget(); final List<TargetPoint> allTargets = getMyApplication().getTargetPointsHelper().getIntermediatePointsWithTarget();
if (model.index > 0 || target) { if (model.index > 0 || target) {