Fix:gui_internal:Don't deactivate the "demo" vehicle when position is set manually.

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

diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c
index d008e9b..6f5daf6 100644 (file)
--- a/navit/navit/gui/internal/gui_internal.c
+++ b/navit/navit/gui/internal/gui_internal.c
@@ -2175,9 +2175,11 @@ static void
 gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm, void *data)
 {
        struct attr v;
-       v.type=attr_vehicle;
-       v.u.vehicle=NULL;
-       navit_set_attr(this->nav, &v);
+       if(data) {
+               v.type=attr_vehicle;
+               v.u.vehicle=NULL;
+               navit_set_attr(this->nav, &v);
+       }
        navit_set_position(this->nav, &wm->c);
        gui_internal_prune_menu(this, NULL);
 }
@@ -3711,16 +3713,20 @@ gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct
                wbc->c=pc;
        }
        if (flags & 16) {
-               const char *text=_("Set as position");
-               struct attr vehicle;
-               if (navit_get_attr(this->nav, attr_vehicle, &vehicle, NULL) && vehicle.u.vehicle) 
-                       text=_("Set as position (and deactivate vehicle)");
+               const char *text;
+               struct attr vehicle, source;
+               int deactivate=0;
+               if (navit_get_attr(this->nav, attr_vehicle, &vehicle, NULL) && vehicle.u.vehicle && 
+                               !(vehicle_get_attr(vehicle.u.vehicle, attr_source, &source, NULL) && source.u.str && !strcmp("demo://",source.u.str))) 
+                       deactivate=1;
+
+               text=deactivate? _("Set as position (and deactivate vehicle)") : _("Set as position");
 
                gui_internal_widget_append(wtable,row=gui_internal_widget_table_row_new(this,gravity_left|orientation_horizontal|flags_fill));
                gui_internal_widget_append(row,
                        wbc=gui_internal_button_new_with_callback(this, text,
                        image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill,
-                       gui_internal_cmd_set_position, wm));
+                       gui_internal_cmd_set_position, (void*)deactivate));
                wbc->c=pc;
        }
        if (flags & 32) {