Fix:Core:Handle multiple calls to navigation_set_route correctly

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4857 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/navigation.c b/navit/navit/navigation.c
index 2288d43..8f44c3e 100644 (file)
--- a/navit/navit/navigation.c
+++ b/navit/navit/navigation.c
@@ -2350,11 +2350,19 @@ void
 navigation_set_route(struct navigation *this_, struct route *route)
 {
        struct attr callback;
-       this_->route=route;
-       this_->route_cb=callback_new_attr_1(callback_cast(navigation_update), attr_route_status, this_);
+       if (!this_->route_cb)
+               this_->route_cb=callback_new_attr_1(callback_cast(navigation_update), attr_route_status, this_);
        callback.type=attr_callback;
        callback.u.callback=this_->route_cb;
-       route_add_attr(route, &callback);
+       if (this_->route)
+               route_remove_attr(this_->route, &callback);
+       this_->route=route;
+       if (this_->route) {
+               struct attr route_status;
+               route_add_attr(this_->route, &callback);
+               if (route_get_attr(this_->route, attr_route_status, &route_status, NULL))
+                       navigation_update(this_, this_->route, &route_status);
+       }
 }
 
 void