Bugfixes

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

diff --git a/navit/src/cursor.h b/navit/src/cursor.h
index 5a71ace..eeb6306 100644 (file)
--- a/navit/src/cursor.h
+++ b/navit/src/cursor.h
@@ -1,5 +1,6 @@
 struct cursor;
 struct container;
+struct vehicle;
 
 struct coord * cursor_pos_get(struct cursor *this);
 struct cursor *cursor_new(struct container *co, struct vehicle *v);

diff --git a/navit/src/gui/gtk/gui_gtk_menu.c b/navit/src/gui/gtk/gui_gtk_menu.c
index 3de3c1c..cba1bab 100644 (file)
--- a/navit/src/gui/gtk/gui_gtk_menu.c
+++ b/navit/src/gui/gtk/gui_gtk_menu.c
@@ -186,6 +186,7 @@ gui_gtk_menu_new(struct container *co, GtkWidget **widget)
        item=gtk_menu_item_new_with_label("Goto");
        gtk_menu_bar_append(GTK_MENU_BAR(menu), item);
        {
+               menu2=gtk_menu_new();
        }
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu2);
 
@@ -296,7 +297,7 @@ gui_gtk_menu_new(struct container *co, GtkWidget **widget)
                GList *list;
        
                file=fopen("locations.txt","r");
-               while (fgets(buffer,8192,file)) {
+               while (file && fgets(buffer,8192,file)) {
                        dest=malloc(sizeof(*dest));
                        dest->co=co;
                        len=strlen(buffer)-1;