From 23932eaa5ebf26711604cefdc2f54353eba503e3 Mon Sep 17 00:00:00 2001 From: martin-s Date: Tue, 26 Jan 2010 08:23:37 +0000 Subject: [PATCH] Fix:gui_internal:Don't crash on gui_internal_cmd_view_on_map git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2925 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/gui/internal/gui_internal.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c index 653298c..e0e2819 100644 --- a/navit/gui/internal/gui_internal.c +++ b/navit/gui/internal/gui_internal.c @@ -2157,20 +2157,18 @@ gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data) static void gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *data) { - struct widget *w=wm->data; - int highlight=(w->data == (void *)2 || w->data == (void *)3 || w->data == (void *)5); - if (highlight) { + if (wm->item.type != type_none) { enum item_type type; - if (w->item.type < type_line) + if (wm->item.type < type_line) type=type_selected_point; - else if (w->item.type < type_area) + else if (wm->item.type < type_area) type=type_selected_point; else type=type_selected_area; graphics_clear_selection(this->gra, NULL); - graphics_add_selection(this->gra, &w->item, type, NULL); + graphics_add_selection(this->gra, &wm->item, type, NULL); } - navit_set_center(this->nav, &w->c, 1); + navit_set_center(this->nav, &wm->c, 1); gui_internal_prune_menu(this, NULL); } @@ -2399,9 +2397,14 @@ gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct #endif if (flags & 128) { gui_internal_widget_append(w, - gui_internal_button_new_with_callback(this, _("View on map"), + wbc=gui_internal_button_new_with_callback(this, _("View on map"), image_new_xs(this, "gui_active"), gravity_left_center|orientation_horizontal|flags_fill, - gui_internal_cmd_view_on_map, wm)); + gui_internal_cmd_view_on_map, NULL)); + wbc->c=pc; + if ((flags & 4) && wm) + wbc->item=wm->item; + else + wbc->item.type=type_none; } if (flags & 256) { int dist=10; -- 1.7.9.5