summaryrefslogtreecommitdiff
path: root/navit/navigation.c
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2015-10-18 16:02:52 +0200
committermvglasow <michael -at- vonglasow.com>2015-10-18 16:02:52 +0200
commit590b225cf6954ace98f177e90428f6773b11c8df (patch)
treedfc807f2dca51b8d69747f951e48e00cff7a5175 /navit/navigation.c
parent933c69e222e9bc5a5d23076ca1ad3651bb184e36 (diff)
downloadnavit-590b225cf6954ace98f177e90428f6773b11c8df.tar.gz
Fix:core:Don't update route path after cancel or destination change
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'navit/navigation.c')
-rw-r--r--navit/navigation.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/navit/navigation.c b/navit/navigation.c
index 7c0609d81..cdde5fdcd 100644
--- a/navit/navigation.c
+++ b/navit/navigation.c
@@ -3669,10 +3669,9 @@ navigation_update_done(struct navigation *this_, int cancel) {
/*
* In order to ensure that route_mr holds either NULL or a valid pointer at any given time,
* always pass a copy of it to map_rect_destroy() and set route_mr to NULL prior to calling
- * map_rect_destroy(). The reason is that map_rect_destroy() for a route map may call idle
- * callback functions before it returns. If one of these calls results in a call to
- * navigation_update(), a race condition will occur. For the same reason, status must be reset
- * before the call to map_rect_destroy().
+ * map_rect_destroy(). The reason is that map_rect_destroy() for a route map may indirectly
+ * call navigation_update(), which will modify the same members. For the same reason, status
+ * must be reset before the call to map_rect_destroy().
*/
this_->status = status_none;
this_->route_mr = NULL;