summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvglasow <michael@vonglasow.com>2020-12-19 14:08:59 +0100
committerGitHub <noreply@github.com>2020-12-19 14:08:59 +0100
commit3ab540c7ea34acec169e4a6ea43429edfaf41ef3 (patch)
treebc8a3b60ac4ba6e19b4299a9ac7de52791201325
parentbab784a39a5d26827fcc76661eee3738e4b46c0e (diff)
parenta1d4b2d311c01d6594a871ede13943da6293fac2 (diff)
downloadnavit-3ab540c7ea34acec169e4a6ea43429edfaf41ef3.tar.gz
Merge pull request #1077 from navit-gps/traff_crash
Minor TraFF-related fixes
-rw-r--r--navit/route.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/navit/route.c b/navit/route.c
index 858e51406..8e2ef91ec 100644
--- a/navit/route.c
+++ b/navit/route.c
@@ -1047,7 +1047,8 @@ struct map_selection * route_get_selection(struct route * this_) {
int i = 0;
GList *tmp;
- c[i++] = this_->pos->c;
+ if (this_->pos)
+ c[i++] = this_->pos->c;
tmp = this_->destinations;
while (tmp) {
struct route_info *dst = tmp->data;
@@ -3157,17 +3158,12 @@ static void route_graph_build_idle(struct route_graph *rg, struct vehicleprofile
* add any routing information to the route graph - this has to be done via the route_graph_flood()
* function.
*
- * The function does not create a graph covering the whole map, but only covering the rectangle
- * between c1 and c2.
- *
* @param ms The mapset to build the route graph from
- * @param c The coordinates of the destination or next waypoint
- * @param c1 Corner 1 of the rectangle to use from the map
- * @param c2 Corner 2 of the rectangle to use from the map
+ * @param c An array of coordinates for the current position, waypoints (if any) and destination
+ * @param count Number of coordinates in `c`
* @param done_cb The callback which will be called when graph is complete
* @return The new route graph.
*/
-// FIXME documentation does not match argument list
static struct route_graph *route_graph_build(struct mapset *ms, struct coord *c, int count, struct callback *done_cb,
int async,
struct vehicleprofile *profile) {