fixes

diff --git a/hostside/commands.c b/hostside/commands.c
index 6066bfffc32561bcfe476cd33a0053b50f1c528a..2efe0bfce259bbb2324294cdf61b89e226414547 100644 (file)
--- 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 21a2af8df7dc894edb16185387c678378ea8f7f3..defc4ccca764491d77a256c424df5a8c4c7b6232 100644 (file)
--- 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 ab4addadd03e5d14083833e2a7c1c94c7c1aef4e..2779867a9088eb3578d226f2396c452db3743fad 100644 (file)
--- 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();
 }