Revert some fixes

This commit is contained in:
Victor Shcherb 2016-01-13 17:08:53 +01:00
parent ad297a1442
commit dd85aa3e68
2 changed files with 0 additions and 10 deletions

View file

@ -227,11 +227,6 @@ public class TargetPointsHelper {
} }
public void updateRouteAndReferesh(boolean updateRoute) { public void updateRouteAndReferesh(boolean updateRoute) {
//Fix for Issue 2136(b-d) (i.e. after Destination has been deleted)
if (pointToNavigate == null) {
MapActivity.getMapActions().stopNavigationWithoutConfirm();
}
if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() || if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) { routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
updateRoutingHelper(); updateRoutingHelper();

View file

@ -1185,11 +1185,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
newRouteIsCalculated(false, new ValueHolder<Boolean>()); newRouteIsCalculated(false, new ValueHolder<Boolean>());
getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true); getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true);
//Fix for Issue 2136(b), but see more global fix in TargetPointsHelper
//if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
// mapActivity.getMapActions().stopNavigationWithoutConfirm();
//}
if (swipeDismissListener != null) { if (swipeDismissListener != null) {
swipeDismissListener.setEnabled(true); swipeDismissListener.setEnabled(true);
} }