From: ian <ian>
Date: Thu, 1 May 2008 23:10:26 +0000 (+0000)
Subject: fixes
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=22cea1382e8dd0db72706668c384c7cec25163ec;p=trains.git

fixes
---

diff --git a/hostside/commands.c b/hostside/commands.c
index 6066bff..2efe0bf 100644
--- a/hostside/commands.c
+++ b/hostside/commands.c
@@ -30,7 +30,7 @@ struct ManualRetransmitNode {
 
 static void cmd_ppc(Train *tra, Segment *seg, void *pu, const char *message) {
   const CmdInfo *ci= pu;
-  oprintf(UPO,"ack %s SignallingPredictedProblem %s %s : %s",
+  oprintf(UPO,"ack %s SignallingPredictedProblem %s %s : %s\n",
 	  ci->name,
 	  tra->pname, seg ? seg->i->pname : "?", message);
 }
diff --git a/hostside/persist.c b/hostside/persist.c
index 21a2af8..defc4cc 100644
--- a/hostside/persist.c
+++ b/hostside/persist.c
@@ -144,7 +144,7 @@ static int persist_convert(const char *data, const char *conv) {
 
 static int try(const char *data, const char *conv) {
   if (!persist_convert(data,conv)) return 0;
-  oprintf(UPO, "info : converted %s using %s",data,conv);
+  oprintf(UPO, "info : converted %s using %s\n",data,conv);
   return 1;
 }
 
diff --git a/hostside/resolve.c b/hostside/resolve.c
index ab4adda..2779867 100644
--- a/hostside/resolve.c
+++ b/hostside/resolve.c
@@ -503,6 +503,7 @@ static int resolve_complete_ends_train(Train *tra) {
     if (seg->resfin_done) {
       seg->owner= tra;
       seg->resfin_done= 0;
+      seg->det_ignore= 1;
     }
   }
 
@@ -536,6 +537,8 @@ void resolve_begin(void) {
       actual_inversions_segment(seg);
     else
       seg->seg_inverted= 0;
+    if (segi->n_poscombs==1)
+      seg->movposcomb= 0;
   }
   actual_inversions_done();
 }