Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-13 11:25:04 +01:00
commit c0ff984127

View file

@ -1223,6 +1223,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
public void deleteWaypoint(int position) { public void deleteWaypoint(int position) {
if (swipeDismissListener != null) { if (swipeDismissListener != null) {
swipeDismissListener.delete(position); swipeDismissListener.delete(position);
//Issue 2136(b)
if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
mapActivity.getMapActions().stopNavigationWithoutConfirm();
}
} }
} }
} }