- currPointTrackpoint = !_track.getPoint(i).isWaypoint() && _track.getPoint(i).getPhoto() == null;
- if (_connectPointsMenuItem.isSelected() && currPointTrackpoint && lastPointTrackpoint)
+ DataPoint point = _track.getPoint(i);
+ currPointTrackpoint = !point.isWaypoint() && point.getPhoto() == null;
+ if (_connectPointsMenuItem.isSelected() && currPointTrackpoint && lastPointTrackpoint
+ && !point.getSegmentStart())