Fix:Core:Mark destination as stopped in destination.txt, closes ticket #980.

Avoids restarting a stopped navigation when Navit is restarted.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4871 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 13 insertions, 1 deletions

diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c
index cbcef0747..b617f1d6b 100644
--- a/navit/map/textfile/textfile.c
+++ b/navit/map/textfile/textfile.c
@@ -39,6 +39,13 @@
 static int map_id;
 
 static void
+remove_comment_line(char* line){
+	if (line==TEXTFILE_COMMENT_CHAR){
+		line='\0';
+	}
+}
+
+static void
 get_line(struct map_rect_priv *mr)
 {
 	if(mr->f) {
@@ -47,10 +54,11 @@ get_line(struct map_rect_priv *mr)
 		else
 			mr->pos+=mr->lastlen;
 		fgets(mr->line, SIZE, mr->f);
+	        dbg(1,"read textfile line: %s\n", mr->line);
+		remove_comment_line(mr->line);
 		mr->lastlen=strlen(mr->line)+1;
 		if (strlen(mr->line) >= SIZE-1) 
 			printf("line too long\n");
-	        dbg(1,"read textfile line: %s\n", mr->line);
 	}
 }
 
diff --git a/navit/map/textfile/textfile.h b/navit/map/textfile/textfile.h
index 05e47699b..36524d6ab 100644
--- a/navit/map/textfile/textfile.h
+++ b/navit/map/textfile/textfile.h
@@ -20,6 +20,10 @@
 #include <stdio.h>
 #include "attr.h"
 #include "coord.h"
+
+#define TEXTFILE_COMMENT_CHAR '#'
+#define TEXTFILE_COMMENT_NAVI_STOPPED "# navigation stopped\n"
+
 struct map_priv {
 	int id;
 	char *filename;